Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(20)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/chromeos/preferences_unittest.cc

Issue 2664753002: Remove base::StringValue (Closed)
Patch Set: Rebase Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc ('k') | chrome/browser/chromeos/proxy_config_service_impl_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/chromeos/preferences_unittest.cc
diff --git a/chrome/browser/chromeos/preferences_unittest.cc b/chrome/browser/chromeos/preferences_unittest.cc
index 5ab644006e404eb1229698cf1cc54a2b947f99fc..03168441c7d301a3f7a106aea05e3af02201ccb4 100644
--- a/chrome/browser/chromeos/preferences_unittest.cc
+++ b/chrome/browser/chromeos/preferences_unittest.cc
@@ -372,13 +372,12 @@ TEST_F(InputMethodPreferencesTest, TestOobeAndSync) {
// 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 =
@@ -413,23 +412,17 @@ TEST_F(InputMethodPreferencesTest, TestOobeAndSync) {
// 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();
@@ -465,12 +458,12 @@ TEST_F(InputMethodPreferencesTest, TestLogIn) {
// 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 =
@@ -505,13 +498,13 @@ TEST_F(InputMethodPreferencesTest, TestLogInLegacy) {
// 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(
@@ -559,16 +552,16 @@ TEST_F(InputMethodPreferencesTest, MergeStressTest) {
// 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 =
@@ -612,15 +605,14 @@ TEST_F(InputMethodPreferencesTest, MergeInvalidValues) {
"_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 =
@@ -655,14 +647,12 @@ TEST_F(InputMethodPreferencesTest, MergeAfterSyncing) {
"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")));
- sync_data_list.push_back(CreatePrefSyncData(
- prefs::kLanguagePreloadEnginesSyncable,
- base::StringValue(preload_engines)));
+ prefs::kLanguagePreferredLanguagesSyncable, base::Value("en-US")));
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 =
« no previous file with comments | « chrome/browser/chromeos/policy/user_cloud_policy_store_chromeos_unittest.cc ('k') | chrome/browser/chromeos/proxy_config_service_impl_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698