more changes

chrome/browser/extensions/extension_prefs_unittest.cc

Index: chrome/browser/extensions/extension_prefs_unittest.cc
diff --git a/chrome/browser/extensions/extension_prefs_unittest.cc b/chrome/browser/extensions/extension_prefs_unittest.cc
index 10a4ae895129294eef747eb5873a420102443ea4..edd52bcf8d75f5ff58d9c2c486076c1b7707404d 100644
--- a/chrome/browser/extensions/extension_prefs_unittest.cc
+++ b/chrome/browser/extensions/extension_prefs_unittest.cc
@@ -830,7 +830,7 @@ class ExtensionPrefsPreferencesBase : public ExtensionPrefsTest {
 class ExtensionPrefsInstallOneExtension
     : public ExtensionPrefsPreferencesBase {
   virtual void Initialize() {
-    InstallExtControlledPref(ext1_, kPref1, Value::CreateStringValue("val1"));
+    InstallExtControlledPref(ext1_, kPref1, base::StringValue::New("val1"));
   }
   virtual void Verify() {
     std::string actual = prefs()->pref_service()->GetString(kPref1);
@@ -844,9 +844,9 @@ class ExtensionPrefsInstallIncognitoPersistent
     : public ExtensionPrefsPreferencesBase {
  public:
   virtual void Initialize() {
-    InstallExtControlledPref(ext1_, kPref1, Value::CreateStringValue("val1"));
+    InstallExtControlledPref(ext1_, kPref1, base::StringValue::New("val1"));
     InstallExtControlledPrefIncognito(ext1_, kPref1,
-                                      Value::CreateStringValue("val2"));
+                                      base::StringValue::New("val2"));
     scoped_ptr<PrefService> incog_prefs(prefs_.CreateIncognitoPrefService());
     std::string actual = incog_prefs->GetString(kPref1);
     EXPECT_EQ("val2", actual);
@@ -871,9 +871,9 @@ class ExtensionPrefsInstallIncognitoSessionOnly
   ExtensionPrefsInstallIncognitoSessionOnly() : iteration_(0) {}
 
   virtual void Initialize() {
-    InstallExtControlledPref(ext1_, kPref1, Value::CreateStringValue("val1"));
+    InstallExtControlledPref(ext1_, kPref1, base::StringValue::New("val1"));
     InstallExtControlledPrefIncognitoSessionOnly(
-        ext1_, kPref1, Value::CreateStringValue("val2"));
+        ext1_, kPref1, base::StringValue::New("val2"));
     scoped_ptr<PrefService> incog_prefs(prefs_.CreateIncognitoPrefService());
     std::string actual = incog_prefs->GetString(kPref1);
     EXPECT_EQ("val2", actual);
@@ -902,8 +902,8 @@ TEST_F(ExtensionPrefsInstallIncognitoSessionOnly,
 class ExtensionPrefsUninstallExtension
     : public ExtensionPrefsPreferencesBase {
   virtual void Initialize() {
-    InstallExtControlledPref(ext1_, kPref1, Value::CreateStringValue("val1"));
-    InstallExtControlledPref(ext1_, kPref2, Value::CreateStringValue("val2"));
+    InstallExtControlledPref(ext1_, kPref1, base::StringValue::New("val1"));
+    InstallExtControlledPref(ext1_, kPref2, base::StringValue::New("val2"));
 
     UninstallExtension(ext1_->id());
   }
@@ -941,7 +941,7 @@ class ExtensionPrefsNotifyWhenNeeded
     EXPECT_CALL(observer, Observe(_, _, _));
     EXPECT_CALL(incognito_observer, Observe(_, _, _));
     InstallExtControlledPref(ext1_, kPref1,
-        Value::CreateStringValue("https://www.chromium.org"));
+        base::StringValue::New("https://www.chromium.org"));
     Mock::VerifyAndClearExpectations(&observer);
     Mock::VerifyAndClearExpectations(&incognito_observer);
 
@@ -949,7 +949,7 @@ class ExtensionPrefsNotifyWhenNeeded
     EXPECT_CALL(observer, Observe(_, _, _)).Times(0);
     EXPECT_CALL(incognito_observer, Observe(_, _, _)).Times(0);
     InstallExtControlledPref(ext1_, kPref1,
-        Value::CreateStringValue("https://www.chromium.org"));
+        base::StringValue::New("https://www.chromium.org"));
     Mock::VerifyAndClearExpectations(&observer);
     Mock::VerifyAndClearExpectations(&incognito_observer);
 
@@ -957,7 +957,7 @@ class ExtensionPrefsNotifyWhenNeeded
     EXPECT_CALL(observer, Observe(_, _, _));
     EXPECT_CALL(incognito_observer, Observe(_, _, _));
     InstallExtControlledPref(ext1_, kPref1,
-        Value::CreateStringValue("chrome://newtab"));
+        base::StringValue::New("chrome://newtab"));
     Mock::VerifyAndClearExpectations(&observer);
     Mock::VerifyAndClearExpectations(&incognito_observer);
 
@@ -965,7 +965,7 @@ class ExtensionPrefsNotifyWhenNeeded
     EXPECT_CALL(observer, Observe(_, _, _)).Times(0);
     EXPECT_CALL(incognito_observer, Observe(_, _, _));
     InstallExtControlledPrefIncognito(ext1_, kPref1,
-        Value::CreateStringValue("chrome://newtab2"));
+        base::StringValue::New("chrome://newtab2"));
     Mock::VerifyAndClearExpectations(&observer);
     Mock::VerifyAndClearExpectations(&incognito_observer);
 
@@ -973,7 +973,7 @@ class ExtensionPrefsNotifyWhenNeeded
     EXPECT_CALL(observer, Observe(_, _, _)).Times(0);
     EXPECT_CALL(incognito_observer, Observe(_, _, _));
     InstallExtControlledPrefIncognito(ext1_, kPref1,
-        Value::CreateStringValue("chrome://newtab3"));
+        base::StringValue::New("chrome://newtab3"));
     Mock::VerifyAndClearExpectations(&observer);
     Mock::VerifyAndClearExpectations(&incognito_observer);
 
@@ -999,7 +999,7 @@ TEST_F(ExtensionPrefsNotifyWhenNeeded,
 class ExtensionPrefsDisableExt
     : public ExtensionPrefsPreferencesBase {
   virtual void Initialize() {
-    InstallExtControlledPref(ext1_, kPref1, Value::CreateStringValue("val1"));
+    InstallExtControlledPref(ext1_, kPref1, base::StringValue::New("val1"));
     std::string actual = prefs()->pref_service()->GetString(kPref1);
     EXPECT_EQ("val1", actual);
     prefs()->SetExtensionState(ext1_->id(), Extension::DISABLED);
@@ -1015,7 +1015,7 @@ TEST_F(ExtensionPrefsDisableExt,  ExtensionPrefsDisableExt) {}
 class ExtensionPrefsReenableExt
     : public ExtensionPrefsPreferencesBase {
   virtual void Initialize() {
-    InstallExtControlledPref(ext1_, kPref1, Value::CreateStringValue("val1"));
+    InstallExtControlledPref(ext1_, kPref1, base::StringValue::New("val1"));
     prefs()->SetExtensionState(ext1_->id(), Extension::DISABLED);
     prefs()->SetExtensionState(ext1_->id(), Extension::ENABLED);
   }