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/umtest_utils.h | |
| 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/umtest_utils.h')
| -rw-r--r-- | update_manager/umtest_utils.h | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/update_manager/umtest_utils.h b/update_manager/umtest_utils.h index 4e2de8e8..c50a5a2e 100644 --- a/update_manager/umtest_utils.h +++ b/update_manager/umtest_utils.h @@ -6,8 +6,8 @@ #define UPDATE_ENGINE_UPDATE_MANAGER_UMTEST_UTILS_H_ #include <iostream> // NOLINT(readability/streams) +#include <memory> -#include <base/memory/scoped_ptr.h> #include <base/time/time.h> #include <gtest/gtest.h> @@ -28,7 +28,8 @@ class UmTestUtils { template<typename T> static void ExpectVariableHasValue(const T& expected, Variable<T>* variable) { ASSERT_NE(nullptr, variable); - scoped_ptr<const T> value(variable->GetValue(DefaultTimeout(), nullptr)); + std::unique_ptr<const T> value( + variable->GetValue(DefaultTimeout(), nullptr)); ASSERT_NE(nullptr, value.get()) << "Variable: " << variable->GetName(); EXPECT_EQ(expected, *value) << "Variable: " << variable->GetName(); } @@ -37,7 +38,8 @@ class UmTestUtils { template<typename T> static void ExpectVariableNotSet(Variable<T>* variable) { ASSERT_NE(nullptr, variable); - scoped_ptr<const T> value(variable->GetValue(DefaultTimeout(), nullptr)); + std::unique_ptr<const T> value( + variable->GetValue(DefaultTimeout(), nullptr)); EXPECT_EQ(nullptr, value.get()) << "Variable: " << variable->GetName(); } |