| 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 8a69ab384f56b6243aeb56a45af9e4ae2237527f..e18722430151ca27fd45994e11116b73892f339a 100644
|
| --- a/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc
|
| +++ b/chrome/browser/extensions/api/preference/preference_api_prefs_unittest.cc
|
| @@ -182,7 +182,7 @@ class ControlledPrefsInstallOneExtension
|
| virtual void Initialize() OVERRIDE {
|
| InstallExtensionControlledPref(extension1(),
|
| kPref1,
|
| - Value::CreateStringValue("val1"));
|
| + new base::StringValue("val1"));
|
| }
|
| virtual void Verify() OVERRIDE {
|
| std::string actual = prefs()->pref_service()->GetString(kPref1);
|
| @@ -198,9 +198,9 @@ class ControlledPrefsInstallIncognitoPersistent
|
| public:
|
| virtual void Initialize() OVERRIDE {
|
| InstallExtensionControlledPref(
|
| - extension1(), kPref1, Value::CreateStringValue("val1"));
|
| + extension1(), kPref1, new base::StringValue("val1"));
|
| InstallExtensionControlledPrefIncognito(
|
| - extension1(), kPref1, Value::CreateStringValue("val2"));
|
| + extension1(), kPref1, new base::StringValue("val2"));
|
| scoped_ptr<PrefService> incog_prefs(prefs_.CreateIncognitoPrefService());
|
| std::string actual = incog_prefs->GetString(kPref1);
|
| EXPECT_EQ("val2", actual);
|
| @@ -227,9 +227,9 @@ class ControlledPrefsInstallIncognitoSessionOnly
|
|
|
| virtual void Initialize() OVERRIDE {
|
| InstallExtensionControlledPref(
|
| - extension1(), kPref1, Value::CreateStringValue("val1"));
|
| + extension1(), kPref1, new base::StringValue("val1"));
|
| InstallExtensionControlledPrefIncognitoSessionOnly(
|
| - extension1(), kPref1, Value::CreateStringValue("val2"));
|
| + extension1(), kPref1, new base::StringValue("val2"));
|
| scoped_ptr<PrefService> incog_prefs(prefs_.CreateIncognitoPrefService());
|
| std::string actual = incog_prefs->GetString(kPref1);
|
| EXPECT_EQ("val2", actual);
|
| @@ -258,9 +258,9 @@ TEST_F(ControlledPrefsInstallIncognitoSessionOnly,
|
| class ControlledPrefsUninstallExtension : public ExtensionControlledPrefsTest {
|
| virtual void Initialize() OVERRIDE {
|
| InstallExtensionControlledPref(
|
| - extension1(), kPref1, Value::CreateStringValue("val1"));
|
| + extension1(), kPref1, new base::StringValue("val1"));
|
| InstallExtensionControlledPref(
|
| - extension1(), kPref2, Value::CreateStringValue("val2"));
|
| + extension1(), kPref2, new base::StringValue("val2"));
|
| ContentSettingsStore* store = prefs()->content_settings_store();
|
| ContentSettingsPattern pattern =
|
| ContentSettingsPattern::FromString("http://[*.]example.com");
|
| @@ -308,7 +308,7 @@ class ControlledPrefsNotifyWhenNeeded : public ExtensionControlledPrefsTest {
|
| EXPECT_CALL(observer, OnPreferenceChanged(_));
|
| EXPECT_CALL(incognito_observer, OnPreferenceChanged(_));
|
| InstallExtensionControlledPref(extension1(), kPref1,
|
| - Value::CreateStringValue("https://www.chromium.org"));
|
| + new base::StringValue("https://www.chromium.org"));
|
| Mock::VerifyAndClearExpectations(&observer);
|
| Mock::VerifyAndClearExpectations(&incognito_observer);
|
|
|
| @@ -316,7 +316,7 @@ class ControlledPrefsNotifyWhenNeeded : public ExtensionControlledPrefsTest {
|
| EXPECT_CALL(observer, OnPreferenceChanged(_)).Times(0);
|
| EXPECT_CALL(incognito_observer, OnPreferenceChanged(_)).Times(0);
|
| InstallExtensionControlledPref(extension1(), kPref1,
|
| - Value::CreateStringValue("https://www.chromium.org"));
|
| + new base::StringValue("https://www.chromium.org"));
|
| Mock::VerifyAndClearExpectations(&observer);
|
| Mock::VerifyAndClearExpectations(&incognito_observer);
|
|
|
| @@ -324,14 +324,14 @@ class ControlledPrefsNotifyWhenNeeded : public ExtensionControlledPrefsTest {
|
| EXPECT_CALL(observer, OnPreferenceChanged(_));
|
| EXPECT_CALL(incognito_observer, OnPreferenceChanged(_));
|
| InstallExtensionControlledPref(extension1(), kPref1,
|
| - Value::CreateStringValue("chrome://newtab"));
|
| + new base::StringValue("chrome://newtab"));
|
| Mock::VerifyAndClearExpectations(&observer);
|
| Mock::VerifyAndClearExpectations(&incognito_observer);
|
| // Change only incognito persistent value.
|
| EXPECT_CALL(observer, OnPreferenceChanged(_)).Times(0);
|
| EXPECT_CALL(incognito_observer, OnPreferenceChanged(_));
|
| InstallExtensionControlledPrefIncognito(extension1(), kPref1,
|
| - Value::CreateStringValue("chrome://newtab2"));
|
| + new base::StringValue("chrome://newtab2"));
|
| Mock::VerifyAndClearExpectations(&observer);
|
| Mock::VerifyAndClearExpectations(&incognito_observer);
|
|
|
| @@ -339,7 +339,7 @@ class ControlledPrefsNotifyWhenNeeded : public ExtensionControlledPrefsTest {
|
| EXPECT_CALL(observer, OnPreferenceChanged(_)).Times(0);
|
| EXPECT_CALL(incognito_observer, OnPreferenceChanged(_));
|
| InstallExtensionControlledPrefIncognito(extension1(), kPref1,
|
| - Value::CreateStringValue("chrome://newtab3"));
|
| + new base::StringValue("chrome://newtab3"));
|
| Mock::VerifyAndClearExpectations(&observer);
|
| Mock::VerifyAndClearExpectations(&incognito_observer);
|
|
|
| @@ -365,7 +365,7 @@ TEST_F(ControlledPrefsNotifyWhenNeeded,
|
| class ControlledPrefsDisableExtension : public ExtensionControlledPrefsTest {
|
| virtual void Initialize() OVERRIDE {
|
| InstallExtensionControlledPref(
|
| - extension1(), kPref1, Value::CreateStringValue("val1"));
|
| + extension1(), kPref1, new base::StringValue("val1"));
|
| std::string actual = prefs()->pref_service()->GetString(kPref1);
|
| EXPECT_EQ("val1", actual);
|
| prefs()->SetExtensionState(extension1()->id(), Extension::DISABLED);
|
| @@ -381,7 +381,7 @@ TEST_F(ControlledPrefsDisableExtension, ControlledPrefsDisableExtension) { }
|
| class ControlledPrefsReenableExtension : public ExtensionControlledPrefsTest {
|
| virtual void Initialize() OVERRIDE {
|
| InstallExtensionControlledPref(
|
| - extension1(), kPref1, Value::CreateStringValue("val1"));
|
| + extension1(), kPref1, new base::StringValue("val1"));
|
| prefs()->SetExtensionState(extension1()->id(), Extension::DISABLED);
|
| prefs()->SetExtensionState(extension1()->id(), Extension::ENABLED);
|
| }
|
| @@ -448,7 +448,7 @@ class ControlledPrefsDisableExtensions : public ExtensionControlledPrefsTest {
|
| virtual ~ControlledPrefsDisableExtensions() {}
|
| virtual void Initialize() OVERRIDE {
|
| InstallExtensionControlledPref(
|
| - extension1(), kPref1, Value::CreateStringValue("val1"));
|
| + extension1(), kPref1, new base::StringValue("val1"));
|
| // This becomes only active in the second verification phase.
|
| prefs_.set_extensions_disabled(true);
|
| }
|
|
|