commit 02f7c1dee242f490143791dbb73fa23fa3007cfa
author Ben Chan <benchan@chromium.org> Sat Oct 18 15:18:02 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Tue Oct 21 00:44:38 2014 +0000
tree 23b466db253d05dfa3d05c0c978c6b156c751e58
parent ef8d08712d01c23d31e27000519cbdeb88f60b73

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>

download_action_unittest.cc

diff --git a/download_action_unittest.cc b/download_action_unittest.cc
index c3eb9de..0bdeacf 100644
--- a/download_action_unittest.cc
+++ b/download_action_unittest.cc
@@ -6,6 +6,7 @@
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>
 
+#include <memory>
 #include <string>
 #include <utility>
 #include <vector>
@@ -27,6 +28,7 @@
 namespace chromeos_update_engine {
 
 using std::string;
+using std::unique_ptr;
 using std::vector;
 using testing::_;
 using testing::AtLeast;
@@ -515,13 +517,13 @@
   }
 
   // The DownloadAction instance under test.
-  scoped_ptr<DownloadAction> download_action_;
+  unique_ptr<DownloadAction> download_action_;
 
   // The HttpFetcher used in the test.
   MockHttpFetcher* http_fetcher_;
 
   // The P2PManager used in the test.
-  scoped_ptr<P2PManager> p2p_manager_;
+  unique_ptr<P2PManager> p2p_manager_;
 
   // The ActionProcessor used for running the actions.
   ActionProcessor processor_;