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_state.h b/update_manager/real_state.h
index 1e2d10e..824656f 100644
--- a/update_manager/real_state.h
+++ b/update_manager/real_state.h
@@ -5,7 +5,7 @@
#ifndef UPDATE_ENGINE_UPDATE_MANAGER_REAL_STATE_H_
#define UPDATE_ENGINE_UPDATE_MANAGER_REAL_STATE_H_
-#include <base/memory/scoped_ptr.h>
+#include <memory>
#include "update_engine/update_manager/state.h"
@@ -56,13 +56,13 @@
private:
// Instances of the providers.
- scoped_ptr<ConfigProvider> config_provider_;
- scoped_ptr<DevicePolicyProvider> device_policy_provider_;
- scoped_ptr<RandomProvider> random_provider_;
- scoped_ptr<ShillProvider> shill_provider_;
- scoped_ptr<SystemProvider> system_provider_;
- scoped_ptr<TimeProvider> time_provider_;
- scoped_ptr<UpdaterProvider> updater_provider_;
+ std::unique_ptr<ConfigProvider> config_provider_;
+ std::unique_ptr<DevicePolicyProvider> device_policy_provider_;
+ std::unique_ptr<RandomProvider> random_provider_;
+ std::unique_ptr<ShillProvider> shill_provider_;
+ std::unique_ptr<SystemProvider> system_provider_;
+ std::unique_ptr<TimeProvider> time_provider_;
+ std::unique_ptr<UpdaterProvider> updater_provider_;
};
} // namespace chromeos_update_manager