Remove base::StringValue

components/sync_preferences/pref_service_syncable_unittest.cc

Index: components/sync_preferences/pref_service_syncable_unittest.cc
diff --git a/components/sync_preferences/pref_service_syncable_unittest.cc b/components/sync_preferences/pref_service_syncable_unittest.cc
index 4123ebef7042d90e7dae76b1a52584788ebd33ac..f44988856e8077ff30f0f62bfed35ccc9d3dea8d 100644
--- a/components/sync_preferences/pref_service_syncable_unittest.cc
+++ b/components/sync_preferences/pref_service_syncable_unittest.cc
@@ -273,13 +273,13 @@ TEST_F(PrefServiceSyncableTest, ModelAssociationCloudHasData) {
 
   syncer::SyncDataList in;
   syncer::SyncChangeList out;
-  AddToRemoteDataList(kStringPrefName, base::StringValue(kExampleUrl1), &in);
+  AddToRemoteDataList(kStringPrefName, base::Value(kExampleUrl1), &in);
   base::ListValue urls_to_restore;
   urls_to_restore.AppendString(kExampleUrl1);
   urls_to_restore.AppendString(kExampleUrl2);
   AddToRemoteDataList(kListPrefName, urls_to_restore, &in);
   AddToRemoteDataList(kDefaultCharsetPrefName,
-                      base::StringValue(kNonDefaultCharsetValue), &in);
+                      base::Value(kNonDefaultCharsetValue), &in);
   InitWithSyncDataTakeOutput(in, &out);
 
   ASSERT_FALSE(FindValue(kStringPrefName, out).get());
@@ -316,7 +316,7 @@ TEST_F(PrefServiceSyncableTest, UpdatedPreferenceWithDefaultValue) {
   InitWithSyncDataTakeOutput(syncer::SyncDataList(), &out);
   out.clear();
 
-  base::StringValue expected(kExampleUrl0);
+  base::Value expected(kExampleUrl0);
   GetPrefs()->Set(kStringPrefName, expected);
 
   std::unique_ptr<base::Value> actual(FindValue(kStringPrefName, out));
@@ -330,7 +330,7 @@ TEST_F(PrefServiceSyncableTest, UpdatedPreferenceWithValue) {
   InitWithSyncDataTakeOutput(syncer::SyncDataList(), &out);
   out.clear();
 
-  base::StringValue expected(kExampleUrl1);
+  base::Value expected(kExampleUrl1);
   GetPrefs()->Set(kStringPrefName, expected);
 
   std::unique_ptr<base::Value> actual(FindValue(kStringPrefName, out));
@@ -342,7 +342,7 @@ TEST_F(PrefServiceSyncableTest, UpdatedSyncNodeActionUpdate) {
   GetPrefs()->SetString(kStringPrefName, kExampleUrl0);
   InitWithNoSyncData();
 
-  base::StringValue expected(kExampleUrl1);
+  base::Value expected(kExampleUrl1);
   syncer::SyncChangeList list;
   list.push_back(MakeRemoteChange(1, kStringPrefName, expected,
                                   SyncChange::ACTION_UPDATE));
@@ -355,7 +355,7 @@ TEST_F(PrefServiceSyncableTest, UpdatedSyncNodeActionUpdate) {
 TEST_F(PrefServiceSyncableTest, UpdatedSyncNodeActionAdd) {
   InitWithNoSyncData();
 
-  base::StringValue expected(kExampleUrl0);
+  base::Value expected(kExampleUrl0);
   syncer::SyncChangeList list;
   list.push_back(
       MakeRemoteChange(1, kStringPrefName, expected, SyncChange::ACTION_ADD));
@@ -370,7 +370,7 @@ TEST_F(PrefServiceSyncableTest, UpdatedSyncNodeActionAdd) {
 TEST_F(PrefServiceSyncableTest, UpdatedSyncNodeUnknownPreference) {
   InitWithNoSyncData();
   syncer::SyncChangeList list;
-  base::StringValue expected(kExampleUrl0);
+  base::Value expected(kExampleUrl0);
   list.push_back(MakeRemoteChange(1, "unknown preference", expected,
                                   SyncChange::ACTION_UPDATE));
   pref_sync_service_->ProcessSyncChanges(FROM_HERE, list);
@@ -380,7 +380,7 @@ TEST_F(PrefServiceSyncableTest, UpdatedSyncNodeUnknownPreference) {
 
 TEST_F(PrefServiceSyncableTest, ManagedPreferences) {
   // Make the homepage preference managed.
-  base::StringValue managed_value("http://example.com");
+  base::Value managed_value("http://example.com");
   prefs_.SetManagedPref(kStringPrefName, managed_value.DeepCopy());
 
   syncer::SyncChangeList out;
@@ -388,13 +388,13 @@ TEST_F(PrefServiceSyncableTest, ManagedPreferences) {
   out.clear();
 
   // Changing the homepage preference should not sync anything.
-  base::StringValue user_value("http://chromium..com");
+  base::Value user_value("http://chromium..com");
   prefs_.SetUserPref(kStringPrefName, user_value.DeepCopy());
   EXPECT_TRUE(out.empty());
 
   // An incoming sync transaction should change the user value, not the managed
   // value.
-  base::StringValue sync_value("http://crbug.com");
+  base::Value sync_value("http://crbug.com");
   syncer::SyncChangeList list;
   list.push_back(MakeRemoteChange(1, kStringPrefName, sync_value,
                                   SyncChange::ACTION_UPDATE));
@@ -451,14 +451,14 @@ TEST_F(PrefServiceSyncableTest, DynamicManagedPreferences) {
   syncer::SyncChangeList out;
   InitWithSyncDataTakeOutput(syncer::SyncDataList(), &out);
   out.clear();
-  base::StringValue initial_value("http://example.com/initial");
+  base::Value initial_value("http://example.com/initial");
   GetPrefs()->Set(kStringPrefName, initial_value);
   std::unique_ptr<base::Value> actual(FindValue(kStringPrefName, out));
   ASSERT_TRUE(actual.get());
   EXPECT_TRUE(initial_value.Equals(actual.get()));
 
   // Switch kHomePage to managed and set a different value.
-  base::StringValue managed_value("http://example.com/managed");
+  base::Value managed_value("http://example.com/managed");
   GetTestingPrefService()->SetManagedPref(kStringPrefName,
                                           managed_value.DeepCopy());
 
@@ -477,18 +477,18 @@ TEST_F(PrefServiceSyncableTest, DynamicManagedPreferencesWithSyncChange) {
   InitWithSyncDataTakeOutput(syncer::SyncDataList(), &out);
   out.clear();
 
-  base::StringValue initial_value("http://example.com/initial");
+  base::Value initial_value("http://example.com/initial");
   GetPrefs()->Set(kStringPrefName, initial_value);
   std::unique_ptr<base::Value> actual(FindValue(kStringPrefName, out));
   EXPECT_TRUE(initial_value.Equals(actual.get()));
 
   // Switch kHomePage to managed and set a different value.
-  base::StringValue managed_value("http://example.com/managed");
+  base::Value managed_value("http://example.com/managed");
   GetTestingPrefService()->SetManagedPref(kStringPrefName,
                                           managed_value.DeepCopy());
 
   // Change the sync value.
-  base::StringValue sync_value("http://example.com/sync");
+  base::Value sync_value("http://example.com/sync");
   syncer::SyncChangeList list;
   list.push_back(MakeRemoteChange(1, kStringPrefName, sync_value,
                                   SyncChange::ACTION_UPDATE));
@@ -516,7 +516,7 @@ TEST_F(PrefServiceSyncableTest, DynamicManagedDefaultPreferences) {
   out.clear();
 
   // Switch kHomePage to managed and set a different value.
-  base::StringValue managed_value("http://example.com/managed");
+  base::Value managed_value("http://example.com/managed");
   GetTestingPrefService()->SetManagedPref(kStringPrefName,
                                           managed_value.DeepCopy());
   // The pref value should be the one dictated by policy.