Remove base::StringValue

chrome/browser/chromeos/preferences_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/preferences.h"
 
 #include <utility>
 
 #include "base/json/json_string_value_serializer.h"
 #include "base/macros.h"
@@ skipping 354 matching lines @@
                  std::string());
   InitPreferences();
 
   // Suppose we add an input method before syncing starts.
   preload_engines_.SetValue(
       ToInputMethodIds("xkb:us:altgr-intl:eng,xkb:us:intl:eng"));
 
   // Create some values to come from the server.
   syncer::SyncDataList sync_data_list;
   sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguagePreferredLanguagesSyncable, base::StringValue("ru,fi")));
+      prefs::kLanguagePreferredLanguagesSyncable, base::Value("ru,fi")));
   sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguagePreloadEnginesSyncable,
-      base::StringValue("xkb:se::swe")));
-  sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguageEnabledExtensionImesSyncable,
-      base::StringValue(kIdentityIMEID)));
+      prefs::kLanguagePreloadEnginesSyncable, base::Value("xkb:se::swe")));
+  sync_data_list.push_back(
+      CreatePrefSyncData(prefs::kLanguageEnabledExtensionImesSyncable,
+                         base::Value(kIdentityIMEID)));
 
   // Sync for the first time.
   syncer::SyncableService* sync =
       pref_service_->GetSyncableService(
           syncer::PREFERENCES);
   sync->MergeDataAndStartSyncing(syncer::PREFERENCES, sync_data_list,
                                  std::unique_ptr<syncer::SyncChangeProcessor>(
                                      new syncer::FakeSyncChangeProcessor),
                                  std::unique_ptr<syncer::SyncErrorFactory>(
                                      new syncer::SyncErrorFactoryMock));
@@ skipping 14 matching lines @@
   }
   {
     SCOPED_TRACE("Server values should have been updated to local values.");
     ExpectGlobalValues(
         expected_languages, expected_preload_engines, expected_extensions);
   }
 
   // Update the global values from the server again.
   syncer::SyncChangeList change_list;
   change_list.push_back(syncer::SyncChange(
-      FROM_HERE,
-      syncer::SyncChange::ACTION_UPDATE,
-      CreatePrefSyncData(
-          prefs::kLanguagePreferredLanguagesSyncable,
-          base::StringValue("de"))));
+      FROM_HERE, syncer::SyncChange::ACTION_UPDATE,
+      CreatePrefSyncData(prefs::kLanguagePreferredLanguagesSyncable,
+                         base::Value("de"))));
   change_list.push_back(syncer::SyncChange(
-      FROM_HERE,
-      syncer::SyncChange::ACTION_UPDATE,
-      CreatePrefSyncData(
-          prefs::kLanguagePreloadEnginesSyncable,
-          base::StringValue(ToInputMethodIds("xkb:de::ger")))));
+      FROM_HERE, syncer::SyncChange::ACTION_UPDATE,
+      CreatePrefSyncData(prefs::kLanguagePreloadEnginesSyncable,
+                         base::Value(ToInputMethodIds("xkb:de::ger")))));
   change_list.push_back(syncer::SyncChange(
-      FROM_HERE,
-      syncer::SyncChange::ACTION_UPDATE,
-      CreatePrefSyncData(
-          prefs::kLanguageEnabledExtensionImesSyncable,
-          base::StringValue(kToUpperIMEID))));
+      FROM_HERE, syncer::SyncChange::ACTION_UPDATE,
+      CreatePrefSyncData(prefs::kLanguageEnabledExtensionImesSyncable,
+                         base::Value(kToUpperIMEID))));
   sync->ProcessSyncChanges(FROM_HERE, change_list);
   content::RunAllBlockingPoolTasksUntilIdle();
 
   {
     SCOPED_TRACE("Local preferences should have remained the same.");
     ExpectLocalValues(
         expected_languages,
         ToInputMethodIds(expected_preload_engines),
         expected_extensions);
   }
@@ skipping 15 matching lines @@
 
   SetLocalValues(languages, preload_engines, extensions);
   SetGlobalValues(languages, preload_engines, extensions);
   pref_service_->SetBoolean(
       prefs::kLanguageShouldMergeInputMethods, false);
   InitPreferences();
 
   // Create some values to come from the server.
   syncer::SyncDataList sync_data_list;
   sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguagePreferredLanguages, base::StringValue("ru,fi")));
+      prefs::kLanguagePreferredLanguages, base::Value("ru,fi")));
+  sync_data_list.push_back(
+      CreatePrefSyncData(prefs::kLanguagePreloadEngines,
+                         base::Value(ToInputMethodIds("xkb:ru::rus"))));
   sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguagePreloadEngines,
-      base::StringValue(ToInputMethodIds("xkb:ru::rus"))));
-  sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguageEnabledExtensionImes, base::StringValue(kIdentityIMEID)));
+      prefs::kLanguageEnabledExtensionImes, base::Value(kIdentityIMEID)));
 
   // Sync.
   syncer::SyncableService* sync =
       pref_service_->GetSyncableService(
           syncer::PREFERENCES);
   sync->MergeDataAndStartSyncing(syncer::PREFERENCES, sync_data_list,
                                  std::unique_ptr<syncer::SyncChangeProcessor>(
                                      new syncer::FakeSyncChangeProcessor),
                                  std::unique_ptr<syncer::SyncErrorFactory>(
                                      new syncer::SyncErrorFactoryMock));
@@ skipping 14 matching lines @@
 // Tests that logging in with preferences from before a) XKB component
 // extensions and b) the IME syncing logic doesn't overwrite settings.
 TEST_F(InputMethodPreferencesTest, TestLogInLegacy) {
   // Simulate existing local preferences from M-36.
   SetLocalValues("es", "xkb:es::spa", kIdentityIMEID);
   InitPreferences();
 
   // Sync. Since this is an existing profile, the local values shouldn't change.
   syncer::SyncDataList sync_data_list;
   sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguagePreferredLanguagesSyncable, base::StringValue("ru,fi")));
-  sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguagePreloadEnginesSyncable,
-      base::StringValue(ToInputMethodIds("xkb:ru::rus"))));
-  sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguageEnabledExtensionImesSyncable,
-      base::StringValue(kToUpperIMEID)));
+      prefs::kLanguagePreferredLanguagesSyncable, base::Value("ru,fi")));
+  sync_data_list.push_back(
+      CreatePrefSyncData(prefs::kLanguagePreloadEnginesSyncable,
+                         base::Value(ToInputMethodIds("xkb:ru::rus"))));
+  sync_data_list.push_back(
+      CreatePrefSyncData(prefs::kLanguageEnabledExtensionImesSyncable,
+                         base::Value(kToUpperIMEID)));
 
   syncer::SyncableService* sync =
       pref_service_->GetSyncableService(
           syncer::PREFERENCES);
   sync->MergeDataAndStartSyncing(syncer::PREFERENCES, sync_data_list,
                                  std::unique_ptr<syncer::SyncChangeProcessor>(
                                      new syncer::FakeSyncChangeProcessor),
                                  std::unique_ptr<syncer::SyncErrorFactory>(
                                      new syncer::SyncErrorFactoryMock));
   content::RunAllBlockingPoolTasksUntilIdle();
@@ skipping 27 matching lines @@
       kToUpperIMEID + std::string(",") +
       kAPIArgumentIMEID + std::string(",") +
       kIdentityIMEID;
   SetLocalValues(
       "en,es,ja,hr,lv,lt,es-419,he,el,da,ca,es,cs,bg,ar",
       ToInputMethodIds("xkb:es::spa,xkb:us:dvorak,xkb:ua::ukr"),
       local_extensions);
 
   // Create some tricky values to come from the server.
   syncer::SyncDataList sync_data_list;
-  sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguagePreferredLanguagesSyncable,
-      base::StringValue("ar,fi,es,de,ar")));
+  sync_data_list.push_back(
+      CreatePrefSyncData(prefs::kLanguagePreferredLanguagesSyncable,
+                         base::Value("ar,fi,es,de,ar")));
   sync_data_list.push_back(CreatePrefSyncData(
       prefs::kLanguagePreloadEnginesSyncable,
-      base::StringValue(
+      base::Value(
           "nacl_mozc_us,xkb:ru::rus,xkb:ru::rus,xkb:es::spa,xkb:es::spa")));
-  sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguageEnabledExtensionImesSyncable,
-      base::StringValue(std::string())));
+  sync_data_list.push_back(
+      CreatePrefSyncData(prefs::kLanguageEnabledExtensionImesSyncable,
+                         base::Value(std::string())));
 
   // Sync for the first time.
   syncer::SyncableService* sync =
       pref_service_->GetSyncableService(
           syncer::PREFERENCES);
   sync->MergeDataAndStartSyncing(syncer::PREFERENCES, sync_data_list,
                                  std::unique_ptr<syncer::SyncChangeProcessor>(
                                      new syncer::FakeSyncChangeProcessor),
                                  std::unique_ptr<syncer::SyncErrorFactory>(
                                      new syncer::SyncErrorFactoryMock));
@@ skipping 23 matching lines @@
   pref_service_->SetBoolean(
       prefs::kLanguageShouldMergeInputMethods, true);
   InitPreferences();
 
   // Create some valid and some non-existent IDs from the server.
   std::string preload_engines(
       "xkb:ru::rus,xkb:xy::xyz,"
       "_comp_ime_nothisisnotactuallyanextensionidxkb:es::spa," +
       ToInputMethodIds("xkb:jp::jpn"));
   syncer::SyncDataList sync_data_list;
+  sync_data_list.push_back(
+      CreatePrefSyncData(prefs::kLanguagePreferredLanguagesSyncable,
+                         base::Value("klingon,en-US")));
   sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguagePreferredLanguagesSyncable,
-      base::StringValue("klingon,en-US")));
-  sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguagePreloadEnginesSyncable,
-      base::StringValue(preload_engines)));
-  sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguageEnabledExtensionImesSyncable,
-      base::StringValue(kUnknownIMEID)));
+      prefs::kLanguagePreloadEnginesSyncable, base::Value(preload_engines)));
+  sync_data_list.push_back(
+      CreatePrefSyncData(prefs::kLanguageEnabledExtensionImesSyncable,
+                         base::Value(kUnknownIMEID)));
 
   // Sync for the first time.
   syncer::SyncableService* sync =
       pref_service_->GetSyncableService(
           syncer::PREFERENCES);
   sync->MergeDataAndStartSyncing(syncer::PREFERENCES, sync_data_list,
                                  std::unique_ptr<syncer::SyncChangeProcessor>(
                                      new syncer::FakeSyncChangeProcessor),
                                  std::unique_ptr<syncer::SyncErrorFactory>(
                                      new syncer::SyncErrorFactoryMock));
@@ skipping 14 matching lines @@
                  ToInputMethodIds("xkb:es::spa,xkb:us::eng"),
                  kIdentityIMEID);
   pref_service_->SetBoolean(
       prefs::kLanguageShouldMergeInputMethods, true);
 
   // Create some valid and some non-existent IDs from the server.
   std::string preload_engines(
       "xkb:ru::rus,xkb:xy::xyz," + ToInputMethodIds("xkb:jp::jpn"));
   syncer::SyncDataList sync_data_list;
   sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguagePreferredLanguagesSyncable,
-      base::StringValue("en-US")));
+      prefs::kLanguagePreferredLanguagesSyncable, base::Value("en-US")));
   sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguagePreloadEnginesSyncable,
-      base::StringValue(preload_engines)));
-  sync_data_list.push_back(CreatePrefSyncData(
-      prefs::kLanguageEnabledExtensionImesSyncable,
-      base::StringValue(kUnknownIMEID)));
+      prefs::kLanguagePreloadEnginesSyncable, base::Value(preload_engines)));
+  sync_data_list.push_back(
+      CreatePrefSyncData(prefs::kLanguageEnabledExtensionImesSyncable,
+                         base::Value(kUnknownIMEID)));
 
   // Sync for the first time.
   syncer::SyncableService* sync =
       pref_service_->GetSyncableService(
           syncer::PREFERENCES);
   sync->MergeDataAndStartSyncing(syncer::PREFERENCES, sync_data_list,
                                  std::unique_ptr<syncer::SyncChangeProcessor>(
                                      new syncer::FakeSyncChangeProcessor),
                                  std::unique_ptr<syncer::SyncErrorFactory>(
                                      new syncer::SyncErrorFactoryMock));
@@ skipping 13 matching lines @@
         "Syncable values should have added local values on initialization.");
     ExpectGlobalValues(
         "es,en-US",
         "xkb:es::spa,xkb:us::eng,xkb:ru::rus,xkb:xy::xyz," +
             ToInputMethodIds("xkb:jp::jpn"),
         std::string(kIdentityIMEID) + "," + kUnknownIMEID);
   }
 }
 
 }  // namespace chromeos