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

Unified Diff: chrome/browser/extensions/test_extension_prefs.cc

Issue 1871713002: Convert //chrome/browser/extensions from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase and fix header 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 | « chrome/browser/extensions/test_extension_prefs.h ('k') | chrome/browser/extensions/test_extension_system.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/extensions/test_extension_prefs.cc
diff --git a/chrome/browser/extensions/test_extension_prefs.cc b/chrome/browser/extensions/test_extension_prefs.cc
index c1137e3357cb243403277957bedfb9b8d0c40ee2..8409146cfe1317aef4d1174a886620f650286dfc 100644
--- a/chrome/browser/extensions/test_extension_prefs.cc
+++ b/chrome/browser/extensions/test_extension_prefs.cc
@@ -4,13 +4,13 @@
#include "chrome/browser/extensions/test_extension_prefs.h"
+#include <memory>
#include <utility>
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/files/file_util.h"
#include "base/macros.h"
-#include "base/memory/scoped_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/sequenced_task_runner.h"
@@ -123,16 +123,14 @@ void TestExtensionPrefs::RecreateExtensionPrefs() {
factory.set_extension_prefs(
new ExtensionPrefStore(extension_pref_value_map_.get(), false));
pref_service_ = factory.CreateSyncable(pref_registry_.get());
- scoped_ptr<ExtensionPrefs> prefs(ExtensionPrefs::Create(
- &profile_,
- pref_service_.get(),
- temp_dir_.path(),
- extension_pref_value_map_.get(),
- extensions_disabled_,
+ std::unique_ptr<ExtensionPrefs> prefs(ExtensionPrefs::Create(
+ &profile_, pref_service_.get(), temp_dir_.path(),
+ extension_pref_value_map_.get(), extensions_disabled_,
std::vector<ExtensionPrefsObserver*>(),
// Guarantee that no two extensions get the same installation time
// stamp and we can reliably assert the installation order in the tests.
- scoped_ptr<ExtensionPrefs::TimeProvider>(new IncrementalTimeProvider())));
+ std::unique_ptr<ExtensionPrefs::TimeProvider>(
+ new IncrementalTimeProvider())));
ExtensionPrefsFactory::GetInstance()->SetInstanceForTesting(&profile_,
std::move(prefs));
// Hack: After recreating ExtensionPrefs, the AppSorting also needs to be
« no previous file with comments | « chrome/browser/extensions/test_extension_prefs.h ('k') | chrome/browser/extensions/test_extension_system.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698