Sync starting language and input method preferences

chrome/browser/chromeos/login/session/user_session_manager.cc

Index: chrome/browser/chromeos/login/session/user_session_manager.cc
diff --git a/chrome/browser/chromeos/login/session/user_session_manager.cc b/chrome/browser/chromeos/login/session/user_session_manager.cc
index de2ea43d9dff7611163003e0b5b2434c2474cf40..b85cf0c1c5dfb02411f37a05a365d2afa9a1c773 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
@@ -148,9 +148,12 @@ void InitLocaleAndInputMethodsForNewUser(
   }
 
   // Save the preferred languages in the user's preferences.
-  StringPrefMember language_preferred_languages;
-  language_preferred_languages.Init(prefs::kLanguagePreferredLanguages, prefs);
-  language_preferred_languages.SetValue(JoinString(language_codes, ','));
+  prefs->SetString(prefs::kLanguagePreferredLanguages,
+                   JoinString(language_codes, ','));
+
+  // Indicate that we need to merge the syncable input methods when we sync,
+  // since we have not applied the synced prefs before.
+  prefs->SetBoolean(prefs::kLanguageShouldMergeInputMethods, true);
 }
 
 #if defined(ENABLE_RLZ)
@@ -1154,4 +1157,8 @@ EasyUnlockKeyManager* UserSessionManager::GetEasyUnlockKeyManager() {
   return easy_unlock_key_manager_.get();
 }
 
+void UserSessionManager::RemoveProfileForTesting(Profile* profile) {
+  default_ime_states_.erase(profile);
+}
+
 }  // namespace chromeos