update_engine: Replace scoped_ptr with std::unique_ptr.
BUG=None
TEST=`FEATURES=test emerge-$BOARD update_engine`
TEST=`USE='clang asan' FEATURES=test emerge-$BOARD update_engine`
Change-Id: I55a2f7f53675faaac20ba25f72ed52cf938d7744
Reviewed-on: https://chromium-review.googlesource.com/224189
Tested-by: Ben Chan <benchan@chromium.org>
Reviewed-by: Alex Deymo <deymo@chromium.org>
Commit-Queue: Ben Chan <benchan@chromium.org>
diff --git a/update_manager/real_system_provider.h b/update_manager/real_system_provider.h
index c040855..9081d94 100644
--- a/update_manager/real_system_provider.h
+++ b/update_manager/real_system_provider.h
@@ -5,8 +5,7 @@
#ifndef UPDATE_ENGINE_UPDATE_MANAGER_REAL_SYSTEM_PROVIDER_H_
#define UPDATE_ENGINE_UPDATE_MANAGER_REAL_SYSTEM_PROVIDER_H_
-#include <base/memory/scoped_ptr.h>
-
+#include <memory>
#include <string>
#include "update_engine/hardware_interface.h"
@@ -41,10 +40,10 @@
}
private:
- scoped_ptr<Variable<bool>> var_is_normal_boot_mode_;
- scoped_ptr<Variable<bool>> var_is_official_build_;
- scoped_ptr<Variable<bool>> var_is_oobe_complete_;
- scoped_ptr<Variable<bool>> var_is_boot_device_removable_;
+ std::unique_ptr<Variable<bool>> var_is_normal_boot_mode_;
+ std::unique_ptr<Variable<bool>> var_is_official_build_;
+ std::unique_ptr<Variable<bool>> var_is_oobe_complete_;
+ std::unique_ptr<Variable<bool>> var_is_boot_device_removable_;
chromeos_update_engine::HardwareInterface* hardware_;