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 e4083e318bc9aab0931cc5bdc1ce60e408215d61..4c70ed1ae407493b36db4dd9cfb4857cdd7077da 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
@@ -102,10 +102,11 @@ void InitLocaleAndInputMethodsForNewUser(PrefService* prefs) {
     }
   }
 
-  // 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 synced input methods when we sync.
+  prefs->SetBoolean(prefs::kLanguageShouldMergeInputMethods, true);
 }
 
 #if defined(ENABLE_RLZ)