more changes

chrome/browser/sync/profile_sync_service_preference_unittest.cc

Index: chrome/browser/sync/profile_sync_service_preference_unittest.cc
diff --git a/chrome/browser/sync/profile_sync_service_preference_unittest.cc b/chrome/browser/sync/profile_sync_service_preference_unittest.cc
index 41c6ba728a192bd012b177aba8c060ad96a768d9..9c2491254ba419df5494c392c2cb8dd265e09d96 100644
--- a/chrome/browser/sync/profile_sync_service_preference_unittest.cc
+++ b/chrome/browser/sync/profile_sync_service_preference_unittest.cc
@@ -272,8 +272,8 @@ TEST_F(ProfileSyncServicePreferenceTest, ModelAssociationEmptyCloud) {
   {
     ListPrefUpdate update(prefs_, prefs::kURLsToRestoreOnStartup);
     ListValue* url_list = update.Get();
-    url_list->Append(Value::CreateStringValue(example_url0_));
-    url_list->Append(Value::CreateStringValue(example_url1_));
+    url_list->Append(base::StringValue::New(example_url0_));
+    url_list->Append(base::StringValue::New(example_url1_));
   }
   CreateRootTask task(this, syncable::PREFERENCES);
   ASSERT_TRUE(StartSyncService(&task, false));
@@ -293,18 +293,18 @@ TEST_F(ProfileSyncServicePreferenceTest, ModelAssociationCloudHasData) {
   {
     ListPrefUpdate update(prefs_, prefs::kURLsToRestoreOnStartup);
     ListValue* url_list = update.Get();
-    url_list->Append(Value::CreateStringValue(example_url0_));
-    url_list->Append(Value::CreateStringValue(example_url1_));
+    url_list->Append(base::StringValue::New(example_url0_));
+    url_list->Append(base::StringValue::New(example_url1_));
   }
 
   PreferenceValues cloud_data;
-  cloud_data[prefs::kHomePage] = Value::CreateStringValue(example_url1_);
+  cloud_data[prefs::kHomePage] = base::StringValue::New(example_url1_);
   ListValue* urls_to_restore = new ListValue;
-  urls_to_restore->Append(Value::CreateStringValue(example_url1_));
-  urls_to_restore->Append(Value::CreateStringValue(example_url2_));
+  urls_to_restore->Append(base::StringValue::New(example_url1_));
+  urls_to_restore->Append(base::StringValue::New(example_url2_));
   cloud_data[prefs::kURLsToRestoreOnStartup] = urls_to_restore;
   cloud_data[prefs::kDefaultCharset] =
-      Value::CreateStringValue(non_default_charset_value_);
+      base::StringValue::New(non_default_charset_value_);
 
   AddPreferenceEntriesTask task(this, cloud_data);
   ASSERT_TRUE(StartSyncService(&task, false));
@@ -319,9 +319,9 @@ TEST_F(ProfileSyncServicePreferenceTest, ModelAssociationCloudHasData) {
   EXPECT_EQ(example_url1_, prefs_->GetString(prefs::kHomePage));
 
   scoped_ptr<ListValue> expected_urls(new ListValue);
-  expected_urls->Append(Value::CreateStringValue(example_url1_));
-  expected_urls->Append(Value::CreateStringValue(example_url2_));
-  expected_urls->Append(Value::CreateStringValue(example_url0_));
+  expected_urls->Append(base::StringValue::New(example_url1_));
+  expected_urls->Append(base::StringValue::New(example_url2_));
+  expected_urls->Append(base::StringValue::New(example_url0_));
   value.reset(GetSyncedValue(prefs::kURLsToRestoreOnStartup));
   ASSERT_TRUE(value.get());
   EXPECT_TRUE(value->Equals(expected_urls.get()));
@@ -352,7 +352,7 @@ TEST_F(ProfileSyncServicePreferenceTest, UpdatedPreferenceWithDefaultValue) {
   ASSERT_TRUE(StartSyncService(&task, false));
   ASSERT_TRUE(task.success());
 
-  scoped_ptr<Value> expected(Value::CreateStringValue(example_url0_));
+  scoped_ptr<Value> expected(base::StringValue::New(example_url0_));
   profile_->GetPrefs()->Set(prefs::kHomePage, *expected);
 
   scoped_ptr<const Value> actual(GetSyncedValue(prefs::kHomePage));
@@ -366,7 +366,7 @@ TEST_F(ProfileSyncServicePreferenceTest, UpdatedPreferenceWithValue) {
   ASSERT_TRUE(StartSyncService(&task, false));
   ASSERT_TRUE(task.success());
 
-  scoped_ptr<Value> expected(Value::CreateStringValue(example_url1_));
+  scoped_ptr<Value> expected(base::StringValue::New(example_url1_));
   profile_->GetPrefs()->Set(prefs::kHomePage, *expected);
 
   scoped_ptr<const Value> actual(GetSyncedValue(prefs::kHomePage));
@@ -380,7 +380,7 @@ TEST_F(ProfileSyncServicePreferenceTest, UpdatedSyncNodeActionUpdate) {
   ASSERT_TRUE(StartSyncService(&task, false));
   ASSERT_TRUE(task.success());
 
-  scoped_ptr<Value> expected(Value::CreateStringValue(example_url1_));
+  scoped_ptr<Value> expected(base::StringValue::New(example_url1_));
   int64 node_id = SetSyncedValue(prefs::kHomePage, *expected);
   ASSERT_NE(node_id, sync_api::kInvalidId);
   scoped_ptr<SyncManager::ChangeRecord> record(MakeChangeRecord(
@@ -400,7 +400,7 @@ TEST_F(ProfileSyncServicePreferenceTest, UpdatedSyncNodeActionAdd) {
   ASSERT_TRUE(StartSyncService(&task, false));
   ASSERT_TRUE(task.success());
 
-  scoped_ptr<Value> expected(Value::CreateStringValue(example_url0_));
+  scoped_ptr<Value> expected(base::StringValue::New(example_url0_));
   int64 node_id = SetSyncedValue(prefs::kHomePage, *expected);
   ASSERT_NE(node_id, sync_api::kInvalidId);
   scoped_ptr<SyncManager::ChangeRecord> record(MakeChangeRecord(
@@ -422,7 +422,7 @@ TEST_F(ProfileSyncServicePreferenceTest, UpdatedSyncNodeUnknownPreference) {
   ASSERT_TRUE(StartSyncService(&task, false));
   ASSERT_TRUE(task.success());
 
-  scoped_ptr<Value> expected(Value::CreateStringValue(example_url0_));
+  scoped_ptr<Value> expected(base::StringValue::New(example_url0_));
   int64 node_id = SetSyncedValue("unknown preference", *expected);
   ASSERT_NE(node_id, sync_api::kInvalidId);
   scoped_ptr<SyncManager::ChangeRecord> record(MakeChangeRecord(
@@ -440,7 +440,7 @@ TEST_F(ProfileSyncServicePreferenceTest, UpdatedSyncNodeUnknownPreference) {
 TEST_F(ProfileSyncServicePreferenceTest, ManagedPreferences) {
   // Make the homepage preference managed.
   scoped_ptr<Value> managed_value(
-      Value::CreateStringValue("http://example.com"));
+      base::StringValue::New("http://example.com"));
   prefs_->SetManagedPref(prefs::kHomePage, managed_value->DeepCopy());
 
   CreateRootTask task(this, syncable::PREFERENCES);
@@ -449,14 +449,14 @@ TEST_F(ProfileSyncServicePreferenceTest, ManagedPreferences) {
 
   // Changing the homepage preference should not sync anything.
   scoped_ptr<Value> user_value(
-      Value::CreateStringValue("http://chromium..com"));
+      base::StringValue::New("http://chromium..com"));
   prefs_->SetUserPref(prefs::kHomePage, user_value->DeepCopy());
   EXPECT_EQ(NULL, GetSyncedValue(prefs::kHomePage));
 
   // An incoming sync transaction should change the user value, not the managed
   // value.
   scoped_ptr<Value> sync_value(
-      Value::CreateStringValue("http://crbug.com"));
+      base::StringValue::New("http://crbug.com"));
   int64 node_id = SetSyncedValue(prefs::kHomePage, *sync_value);
   ASSERT_NE(node_id, sync_api::kInvalidId);
   scoped_ptr<SyncManager::ChangeRecord> record(MakeChangeRecord(
@@ -477,14 +477,14 @@ TEST_F(ProfileSyncServicePreferenceTest, DynamicManagedPreferences) {
   ASSERT_TRUE(task.success());
 
   scoped_ptr<Value> initial_value(
-      Value::CreateStringValue("http://example.com/initial"));
+      base::StringValue::New("http://example.com/initial"));
   profile_->GetPrefs()->Set(prefs::kHomePage, *initial_value);
   scoped_ptr<const Value> actual(GetSyncedValue(prefs::kHomePage));
   EXPECT_TRUE(initial_value->Equals(actual.get()));
 
   // Switch kHomePage to managed and set a different value.
   scoped_ptr<Value> managed_value(
-      Value::CreateStringValue("http://example.com/managed"));
+      base::StringValue::New("http://example.com/managed"));
   profile_->GetTestingPrefService()->SetManagedPref(
       prefs::kHomePage, managed_value->DeepCopy());
 
@@ -505,20 +505,20 @@ TEST_F(ProfileSyncServicePreferenceTest,
   ASSERT_TRUE(task.success());
 
   scoped_ptr<Value> initial_value(
-      Value::CreateStringValue("http://example.com/initial"));
+      base::StringValue::New("http://example.com/initial"));
   profile_->GetPrefs()->Set(prefs::kHomePage, *initial_value);
   scoped_ptr<const Value> actual(GetSyncedValue(prefs::kHomePage));
   EXPECT_TRUE(initial_value->Equals(actual.get()));
 
   // Switch kHomePage to managed and set a different value.
   scoped_ptr<Value> managed_value(
-      Value::CreateStringValue("http://example.com/managed"));
+      base::StringValue::New("http://example.com/managed"));
   profile_->GetTestingPrefService()->SetManagedPref(
       prefs::kHomePage, managed_value->DeepCopy());
 
   // Change the sync value.
   scoped_ptr<Value> sync_value(
-      Value::CreateStringValue("http://example.com/sync"));
+      base::StringValue::New("http://example.com/sync"));
   int64 node_id = SetSyncedValue(prefs::kHomePage, *sync_value);
   ASSERT_NE(node_id, sync_api::kInvalidId);
   scoped_ptr<SyncManager::ChangeRecord> record(MakeChangeRecord(