commit f6f806674c4f6ebbb8b20197ae5b6c7a40bba08f
author dcheng <dcheng@chromium.org> Wed Apr 20 20:26:04 2016
committer Commit bot <commit-bot@chromium.org> Wed Apr 20 20:28:20 2016
tree c8888bc2c7012d88bb246777a4692e00b63d764e
parent 3b6cf06b869ea4900c60ee8bff17e66746d29b1f

Convert //extensions/renderer from scoped_ptr to std::unique_ptr

BUG=554298

Review URL: https://codereview.chromium.org/1899083003

Cr-Commit-Position: refs/heads/master@{#388568}

extensions/renderer/module_system_test.cc

diff --git a/extensions/renderer/module_system_test.cc b/extensions/renderer/module_system_test.cc
index e51cc63..87f6786 100644
--- a/extensions/renderer/module_system_test.cc
+++ b/extensions/renderer/module_system_test.cc
@@ -7,6 +7,7 @@
 #include <stddef.h>
 
 #include <map>
+#include <memory>
 #include <string>
 #include <utility>
 
@@ -15,7 +16,7 @@
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/memory/ptr_util.h"
 #include "base/path_service.h"
 #include "base/strings/string_piece.h"
 #include "extensions/common/extension_paths.h"
@@ -52,9 +53,9 @@
   }
 
  private:
-  scoped_ptr<v8::Extension> safe_builtins_;
+  std::unique_ptr<v8::Extension> safe_builtins_;
   std::vector<const char*> names_;
-  scoped_ptr<v8::ExtensionConfiguration> configuration_;
+  std::unique_ptr<v8::ExtensionConfiguration> configuration_;
 };
 
 base::LazyInstance<V8ExtensionConfigurator>::Leaky g_v8_extension_configurator =
@@ -143,21 +144,21 @@
   assert_natives_ = new AssertNatives(context_.get());
 
   {
-    scoped_ptr<ModuleSystem> module_system(
+    std::unique_ptr<ModuleSystem> module_system(
         new ModuleSystem(context_.get(), source_map_.get()));
     context_->set_module_system(std::move(module_system));
   }
   ModuleSystem* module_system = context_->module_system();
   module_system->RegisterNativeHandler(
-      "assert", scoped_ptr<NativeHandler>(assert_natives_));
+      "assert", std::unique_ptr<NativeHandler>(assert_natives_));
   module_system->RegisterNativeHandler(
       "logging",
-      scoped_ptr<NativeHandler>(new LoggingNativeHandler(context_.get())));
+      std::unique_ptr<NativeHandler>(new LoggingNativeHandler(context_.get())));
   module_system->RegisterNativeHandler(
       "utils",
-      scoped_ptr<NativeHandler>(new UtilsNativeHandler(context_.get())));
+      std::unique_ptr<NativeHandler>(new UtilsNativeHandler(context_.get())));
   module_system->SetExceptionHandlerForTest(
-      scoped_ptr<ModuleSystem::ExceptionHandler>(new FailsOnException));
+      std::unique_ptr<ModuleSystem::ExceptionHandler>(new FailsOnException));
 }
 
 ModuleSystemTestEnvironment::~ModuleSystemTestEnvironment() {
@@ -247,8 +248,9 @@
   }
 }
 
-scoped_ptr<ModuleSystemTestEnvironment> ModuleSystemTest::CreateEnvironment() {
-  return make_scoped_ptr(new ModuleSystemTestEnvironment(isolate_));
+std::unique_ptr<ModuleSystemTestEnvironment>
+ModuleSystemTest::CreateEnvironment() {
+  return base::WrapUnique(new ModuleSystemTestEnvironment(isolate_));
 }
 
 void ModuleSystemTest::ExpectNoAssertionsMade() {