diff options
| author | Ben Chan <benchan@chromium.org> | 2014-10-18 15:18:02 -0700 |
|---|---|---|
| committer | chrome-internal-fetch <chrome-internal-fetch@google.com> | 2014-10-21 00:44:38 +0000 |
| commit | 02f7c1dee242f490143791dbb73fa23fa3007cfa (patch) | |
| tree | 23b466db253d05dfa3d05c0c978c6b156c751e58 /update_manager/update_manager_unittest.cc | |
| parent | ef8d08712d01c23d31e27000519cbdeb88f60b73 (diff) | |
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>
Diffstat (limited to 'update_manager/update_manager_unittest.cc')
| -rw-r--r-- | update_manager/update_manager_unittest.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/update_manager/update_manager_unittest.cc b/update_manager/update_manager_unittest.cc index 9e21716d..b263fc8f 100644 --- a/update_manager/update_manager_unittest.cc +++ b/update_manager/update_manager_unittest.cc @@ -5,13 +5,13 @@ #include <unistd.h> #include <algorithm> +#include <memory> #include <string> #include <tuple> #include <utility> #include <vector> #include <base/bind.h> -#include <base/memory/scoped_ptr.h> #include <base/time/time.h> #include <gmock/gmock.h> #include <gtest/gtest.h> @@ -33,6 +33,7 @@ using chromeos_update_engine::FakeClock; using std::pair; using std::string; using std::tuple; +using std::unique_ptr; using std::vector; using testing::Return; using testing::StrictMock; @@ -68,7 +69,7 @@ class UmUpdateManagerTest : public ::testing::Test { FakeState* fake_state_; // Owned by the umut_. FakeClock fake_clock_; - scoped_ptr<UpdateManager> umut_; + unique_ptr<UpdateManager> umut_; }; // The FailingPolicy implements a single method and make it always fail. This |