Revert of Sync starting language and input method preferences

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

 // Copyright 2014 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/login/session/user_session_manager.h"
 
 #include <string>
 
 #include "base/base_paths.h"
 #include "base/bind.h"
@@ skipping 154 matching lines @@
   for (size_t i = 0; i < candidates.size(); ++i) {
     const std::string& candidate = candidates[i];
     // Skip if it's already in language_codes.
     if (std::count(language_codes.begin(), language_codes.end(),
                    candidate) == 0) {
       language_codes.push_back(candidate);
     }
   }
 
   // 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)
 // Flag file that disables RLZ tracking, when present.
 const base::FilePath::CharType kRLZDisabledFlagName[] =
     FILE_PATH_LITERAL(".rlz_disabled");
 
 base::FilePath GetRlzDisabledFlagPath() {
   base::FilePath homedir;
   PathService::Get(base::DIR_HOME, &homedir);
@@ skipping 1290 matching lines @@
 }
 
 // static
 void UserSessionManager::RunCallbackOnLocaleLoaded(
     const base::Closure& callback,
     InputEventsBlocker* /* input_events_blocker */,
     const locale_util::LanguageSwitchResult& /* result */) {
   callback.Run();
 }
 
-void UserSessionManager::RemoveProfileForTesting(Profile* profile) {
-  default_ime_states_.erase(profile);
-}
-
 }  // namespace chromeos