Revert of 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 a66fe09e3151fa0fa33f3ed231abb0274c9da9d3..5b68bb9e79e8218ee1de6f5dfbbf3c7a3bfb250d 100644
--- a/chrome/browser/chromeos/login/session/user_session_manager.cc
+++ b/chrome/browser/chromeos/login/session/user_session_manager.cc
@@ -172,12 +172,9 @@
   }
 
   // Save the preferred languages in the user's preferences.
-  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);
+  StringPrefMember language_preferred_languages;
+  language_preferred_languages.Init(prefs::kLanguagePreferredLanguages, prefs);
+  language_preferred_languages.SetValue(JoinString(language_codes, ','));
 }
 
 #if defined(ENABLE_RLZ)
@@ -1488,8 +1485,4 @@
   callback.Run();
 }
 
-void UserSessionManager::RemoveProfileForTesting(Profile* profile) {
-  default_ime_states_.erase(profile);
-}
-
 }  // namespace chromeos