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>

subprocess.cc

diff --git a/subprocess.cc b/subprocess.cc
index 76be10c..253ba17 100644
--- a/subprocess.cc
+++ b/subprocess.cc
@@ -8,11 +8,11 @@
 #include <string.h>
 #include <unistd.h>
 
+#include <memory>
 #include <string>
 #include <vector>
 
 #include <base/logging.h>
-#include <base/memory/scoped_ptr.h>
 #include <base/strings/string_util.h>
 #include <base/strings/stringprintf.h>
 
@@ -20,6 +20,7 @@
 
 using std::shared_ptr;
 using std::string;
+using std::unique_ptr;
 using std::vector;
 
 namespace chromeos_update_engine {
@@ -127,7 +128,7 @@
                           ExecCallback callback,
                           void* p) {
   GPid child_pid;
-  scoped_ptr<char*[]> argv(new char*[cmd.size() + 1]);
+  unique_ptr<char*[]> argv(new char*[cmd.size() + 1]);
   for (unsigned int i = 0; i < cmd.size(); i++) {
     argv[i] = strdup(cmd[i].c_str());
     if (!argv[i]) {
@@ -196,7 +197,7 @@
     *stdout = "";
   }
   GError* err = nullptr;
-  scoped_ptr<char*[]> argv(new char*[cmd.size() + 1]);
+  unique_ptr<char*[]> argv(new char*[cmd.size() + 1]);
   for (unsigned int i = 0; i < cmd.size(); i++) {
     argv[i] = strdup(cmd[i].c_str());
     if (!argv[i]) {