Convert //base to use std::unique_ptr

base/environment.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/environment.h"
 
 #include <stddef.h>
 
 #include <vector>
 
@@ skipping 51 matching lines @@
     // Note that the variable may be defined but empty.
     if (result)
       *result = env_value;
     return true;
 #elif defined(OS_WIN)
     DWORD value_length = ::GetEnvironmentVariable(
         UTF8ToWide(variable_name).c_str(), NULL, 0);
     if (value_length == 0)
       return false;
     if (result) {
-      scoped_ptr<wchar_t[]> value(new wchar_t[value_length]);
+      std::unique_ptr<wchar_t[]> value(new wchar_t[value_length]);
       ::GetEnvironmentVariable(UTF8ToWide(variable_name).c_str(), value.get(),
                                value_length);
       *result = WideToUTF8(value.get());
     }
     return true;
 #else
 #error need to port
 #endif
   }
 
@@ skipping 94 matching lines @@
   // An additional null marks the end of the list. We always need a double-null
   // in case nothing was added above.
   if (result.empty())
     result.push_back(0);
   result.push_back(0);
   return result;
 }
 
 #elif defined(OS_POSIX)
 
-scoped_ptr<char*[]> AlterEnvironment(const char* const* const env,
-                                     const EnvironmentMap& changes) {
+std::unique_ptr<char* []> AlterEnvironment(const char* const* const env,
+                                           const EnvironmentMap& changes) {
   std::string value_storage;  // Holds concatenated null-terminated strings.
   std::vector<size_t> result_indices;  // Line indices into value_storage.
 
   // First build up all of the unchanged environment strings. These are
   // null-terminated of the form "key=value".
   std::string key;
   for (size_t i = 0; env[i]; i++) {
     size_t line_length = ParseEnvLine(env[i], &key);
 
     // Keep only values not specified in the change vector.
@@ skipping 12 matching lines @@
       value_storage.append(i->first);
       value_storage.push_back('=');
       value_storage.append(i->second);
       value_storage.push_back(0);
     }
   }
 
   size_t pointer_count_required =
       result_indices.size() + 1 +  // Null-terminated array of pointers.
       (value_storage.size() + sizeof(char*) - 1) / sizeof(char*);  // Buffer.
-  scoped_ptr<char*[]> result(new char*[pointer_count_required]);
+  std::unique_ptr<char* []> result(new char*[pointer_count_required]);
 
   // The string storage goes after the array of pointers.
   char* storage_data = reinterpret_cast<char*>(
       &result.get()[result_indices.size() + 1]);
   if (!value_storage.empty())
     memcpy(storage_data, value_storage.data(), value_storage.size());
 
   // Fill array of pointers at the beginning of the result.
   for (size_t i = 0; i < result_indices.size(); i++)
     result[i] = &storage_data[result_indices[i]];
   result[result_indices.size()] = 0;  // Null terminator.
 
   return result;
 }
 
 #endif  // OS_POSIX
 
 }  // namespace base