Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1883)

Unified Diff: extensions/renderer/module_system_test.cc

Issue 1899083003: Convert //extensions/renderer from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « extensions/renderer/module_system_test.h ('k') | extensions/renderer/module_system_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: extensions/renderer/module_system_test.cc
diff --git a/extensions/renderer/module_system_test.cc b/extensions/renderer/module_system_test.cc
index e51cc63fd2b903488b30eeddc81f70f4c703bc64..87f6786bb25c860a597c92b5606a63b4f0f87c58 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 @@ class V8ExtensionConfigurator {
}
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 @@ ModuleSystemTestEnvironment::ModuleSystemTestEnvironment(v8::Isolate* isolate)
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 @@ void ModuleSystemTest::TearDown() {
}
}
-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() {
« no previous file with comments | « extensions/renderer/module_system_test.h ('k') | extensions/renderer/module_system_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698