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

Unified Diff: chrome/browser/extensions/api/preference/preference_api_prefs_unittest.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
Index: chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc
diff --git a/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc b/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc
index 187035d6b8e73a8c890d4b125f22ee39b589928a..6fcad79d080bc0418e40064b9b6d211feba3ebd0 100644
--- a/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc
+++ b/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc
@@ -4,11 +4,11 @@
#include <stddef.h>
+#include <memory>
#include <string>
#include "base/macros.h"
#include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
#include "base/values.h"
#include "chrome/browser/extensions/api/content_settings/content_settings_service.h"
#include "chrome/browser/extensions/api/preference/preference_api.h"
@@ -213,7 +213,8 @@ class ControlledPrefsInstallIncognitoPersistent
extension1(), kPref1, new base::StringValue("val1"));
InstallExtensionControlledPrefIncognito(
extension1(), kPref1, new base::StringValue("val2"));
- scoped_ptr<PrefService> incog_prefs(prefs_.CreateIncognitoPrefService());
+ std::unique_ptr<PrefService> incog_prefs(
+ prefs_.CreateIncognitoPrefService());
std::string actual = incog_prefs->GetString(kPref1);
EXPECT_EQ("val2", actual);
}
@@ -223,7 +224,8 @@ class ControlledPrefsInstallIncognitoPersistent
std::string actual = prefs()->pref_service()->GetString(kPref1);
EXPECT_EQ("val1", actual);
// Incognito pref service shall see incognito values.
- scoped_ptr<PrefService> incog_prefs(prefs_.CreateIncognitoPrefService());
+ std::unique_ptr<PrefService> incog_prefs(
+ prefs_.CreateIncognitoPrefService());
actual = incog_prefs->GetString(kPref1);
EXPECT_EQ("val2", actual);
}
@@ -242,7 +244,8 @@ class ControlledPrefsInstallIncognitoSessionOnly
extension1(), kPref1, new base::StringValue("val1"));
InstallExtensionControlledPrefIncognitoSessionOnly(
extension1(), kPref1, new base::StringValue("val2"));
- scoped_ptr<PrefService> incog_prefs(prefs_.CreateIncognitoPrefService());
+ std::unique_ptr<PrefService> incog_prefs(
+ prefs_.CreateIncognitoPrefService());
std::string actual = incog_prefs->GetString(kPref1);
EXPECT_EQ("val2", actual);
}
@@ -253,7 +256,8 @@ class ControlledPrefsInstallIncognitoSessionOnly
// Incognito pref service shall see session-only incognito values only
// during first run. Once the pref service was reloaded, all values shall be
// discarded.
- scoped_ptr<PrefService> incog_prefs(prefs_.CreateIncognitoPrefService());
+ std::unique_ptr<PrefService> incog_prefs(
+ prefs_.CreateIncognitoPrefService());
actual = incog_prefs->GetString(kPref1);
if (iteration_ == 0) {
EXPECT_EQ("val2", actual);
@@ -311,7 +315,8 @@ class ControlledPrefsNotifyWhenNeeded : public ExtensionControlledPrefsTest {
registrar.Add(kPref1, observer.GetCallback());
MockPrefChangeCallback incognito_observer(prefs()->pref_service());
- scoped_ptr<PrefService> incog_prefs(prefs_.CreateIncognitoPrefService());
+ std::unique_ptr<PrefService> incog_prefs(
+ prefs_.CreateIncognitoPrefService());
PrefChangeRegistrar incognito_registrar;
incognito_registrar.Init(incog_prefs.get());
incognito_registrar.Add(kPref1, incognito_observer.GetCallback());

Powered by Google App Engine
This is Rietveld 408576698