more changes

chrome/browser/prefs/pref_model_associator_unittest.cc

Index: chrome/browser/prefs/pref_model_associator_unittest.cc
diff --git a/chrome/browser/prefs/pref_model_associator_unittest.cc b/chrome/browser/prefs/pref_model_associator_unittest.cc
index 00864beebeef08982f7450f6ecc934c8fb500829..a3302e7f551be26353a8a159e69159534f2ba693 100644
--- a/chrome/browser/prefs/pref_model_associator_unittest.cc
+++ b/chrome/browser/prefs/pref_model_associator_unittest.cc
@@ -31,7 +31,7 @@ class AbstractPreferenceMergeTest : public TestingBrowserProcessTest {
     }
     expression_dict->SetWithoutPathExpansion(
         content_type,
-        Value::CreateIntegerValue(setting));
+        base::NumberValue::New(setting));
   }
 
   void SetPrefToEmpty(const std::string& pref_name) {
@@ -63,8 +63,8 @@ class ListPreferenceMergeTest : public AbstractPreferenceMergeTest {
 
   virtual void SetUp() {
     AbstractPreferenceMergeTest::SetUp();
-    server_url_list_.Append(Value::CreateStringValue(server_url0_));
-    server_url_list_.Append(Value::CreateStringValue(server_url1_));
+    server_url_list_.Append(base::StringValue::New(server_url0_));
+    server_url_list_.Append(base::StringValue::New(server_url1_));
   }
 
   std::string server_url0_;
@@ -78,7 +78,7 @@ TEST_F(ListPreferenceMergeTest, NotListOrDictionary) {
   pref_service_->SetString(prefs::kHomePage, local_url0_);
   const PrefService::Preference* pref =
       pref_service_->FindPreference(prefs::kHomePage);
-  scoped_ptr<Value> server_value(Value::CreateStringValue(server_url0_));
+  scoped_ptr<Value> server_value(base::StringValue::New(server_url0_));
   scoped_ptr<Value> merged_value(
       PrefModelAssociator::MergePreference(*pref, *server_value));
   EXPECT_TRUE(merged_value->Equals(server_value.get()));
@@ -94,11 +94,11 @@ TEST_F(ListPreferenceMergeTest, LocalEmpty) {
 }
 
 TEST_F(ListPreferenceMergeTest, ServerNull) {
-  scoped_ptr<Value> null_value(Value::CreateNullValue());
+  scoped_ptr<Value> null_value(base::NullValue());
   {
     ListPrefUpdate update(pref_service_, prefs::kURLsToRestoreOnStartup);
     ListValue* local_list_value = update.Get();
-    local_list_value->Append(Value::CreateStringValue(local_url0_));
+    local_list_value->Append(base::StringValue::New(local_url0_));
   }
 
   const PrefService::Preference* pref =
@@ -115,7 +115,7 @@ TEST_F(ListPreferenceMergeTest, ServerEmpty) {
   {
     ListPrefUpdate update(pref_service_, prefs::kURLsToRestoreOnStartup);
     ListValue* local_list_value = update.Get();
-    local_list_value->Append(Value::CreateStringValue(local_url0_));
+    local_list_value->Append(base::StringValue::New(local_url0_));
   }
 
   const PrefService::Preference* pref =
@@ -131,8 +131,8 @@ TEST_F(ListPreferenceMergeTest, Merge) {
   {
     ListPrefUpdate update(pref_service_, prefs::kURLsToRestoreOnStartup);
     ListValue* local_list_value = update.Get();
-    local_list_value->Append(Value::CreateStringValue(local_url0_));
-    local_list_value->Append(Value::CreateStringValue(local_url1_));
+    local_list_value->Append(base::StringValue::New(local_url0_));
+    local_list_value->Append(base::StringValue::New(local_url1_));
   }
 
   const PrefService::Preference* pref =
@@ -141,10 +141,10 @@ TEST_F(ListPreferenceMergeTest, Merge) {
       PrefModelAssociator::MergePreference(*pref, server_url_list_));
 
   ListValue expected;
-  expected.Append(Value::CreateStringValue(server_url0_));
-  expected.Append(Value::CreateStringValue(server_url1_));
-  expected.Append(Value::CreateStringValue(local_url0_));
-  expected.Append(Value::CreateStringValue(local_url1_));
+  expected.Append(base::StringValue::New(server_url0_));
+  expected.Append(base::StringValue::New(server_url1_));
+  expected.Append(base::StringValue::New(local_url0_));
+  expected.Append(base::StringValue::New(local_url1_));
   EXPECT_TRUE(merged_value->Equals(&expected));
 }
 
@@ -152,9 +152,9 @@ TEST_F(ListPreferenceMergeTest, Duplicates) {
   {
     ListPrefUpdate update(pref_service_, prefs::kURLsToRestoreOnStartup);
     ListValue* local_list_value = update.Get();
-    local_list_value->Append(Value::CreateStringValue(local_url0_));
-    local_list_value->Append(Value::CreateStringValue(server_url0_));
-    local_list_value->Append(Value::CreateStringValue(server_url1_));
+    local_list_value->Append(base::StringValue::New(local_url0_));
+    local_list_value->Append(base::StringValue::New(server_url0_));
+    local_list_value->Append(base::StringValue::New(server_url1_));
   }
 
   const PrefService::Preference* pref =
@@ -163,9 +163,9 @@ TEST_F(ListPreferenceMergeTest, Duplicates) {
       PrefModelAssociator::MergePreference(*pref, server_url_list_));
 
   ListValue expected;
-  expected.Append(Value::CreateStringValue(server_url0_));
-  expected.Append(Value::CreateStringValue(server_url1_));
-  expected.Append(Value::CreateStringValue(local_url0_));
+  expected.Append(base::StringValue::New(server_url0_));
+  expected.Append(base::StringValue::New(server_url1_));
+  expected.Append(base::StringValue::New(local_url0_));
   EXPECT_TRUE(merged_value->Equals(&expected));
 }
 
@@ -173,8 +173,8 @@ TEST_F(ListPreferenceMergeTest, Equals) {
   {
     ListPrefUpdate update(pref_service_, prefs::kURLsToRestoreOnStartup);
     ListValue* local_list_value = update.Get();
-    local_list_value->Append(Value::CreateStringValue(server_url0_));
-    local_list_value->Append(Value::CreateStringValue(server_url1_));
+    local_list_value->Append(base::StringValue::New(server_url0_));
+    local_list_value->Append(base::StringValue::New(server_url1_));
   }
 
   scoped_ptr<Value> original(server_url_list_.DeepCopy());
@@ -219,7 +219,7 @@ TEST_F(DictionaryPreferenceMergeTest, LocalEmpty) {
 }
 
 TEST_F(DictionaryPreferenceMergeTest, ServerNull) {
-  scoped_ptr<Value> null_value(Value::CreateNullValue());
+  scoped_ptr<Value> null_value(base::NullValue());
   {
     DictionaryPrefUpdate update(pref_service_, prefs::kContentSettingsPatterns);
     DictionaryValue* local_dict_value = update.Get();
@@ -335,7 +335,7 @@ class IndividualPreferenceMergeTest : public AbstractPreferenceMergeTest {
 
   virtual void SetUp() {
     AbstractPreferenceMergeTest::SetUp();
-    server_url_list_.Append(Value::CreateStringValue(url0_));
+    server_url_list_.Append(base::StringValue::New(url0_));
     SetContentPattern(&server_patterns_, expression0_, content_type0_, 1);
   }
 
@@ -343,7 +343,7 @@ class IndividualPreferenceMergeTest : public AbstractPreferenceMergeTest {
     {
       ListPrefUpdate update(pref_service_, pref);
       ListValue* local_list_value = update.Get();
-      local_list_value->Append(Value::CreateStringValue(url1_));
+      local_list_value->Append(base::StringValue::New(url1_));
     }
 
     scoped_ptr<Value> merged_value(PrefModelAssociator::MergePreference(
@@ -351,8 +351,8 @@ class IndividualPreferenceMergeTest : public AbstractPreferenceMergeTest {
         server_url_list_));
 
     ListValue expected;
-    expected.Append(Value::CreateStringValue(url0_));
-    expected.Append(Value::CreateStringValue(url1_));
+    expected.Append(base::StringValue::New(url0_));
+    expected.Append(base::StringValue::New(url1_));
     return merged_value->Equals(&expected);
   }