Revert of Sync starting language and input method preferences

chrome/common/pref_names.cc

 // Copyright (c) 2012 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/common/pref_names.h"
 
 #include "base/basictypes.h"
 #include "chrome/common/pref_font_webkit_names.h"
 
 namespace prefs {
@@ skipping 521 matching lines @@
 
 // A string pref (comma-separated list) set to the "previous engine"
 // hot-key lists.
 const char kLanguageHotkeyPreviousEngine[] =
     "settings.language.hotkey_previous_engine";
 
 // A string pref (comma-separated list) set to the preferred language IDs
 // (ex. "en-US,fr,ko").
 const char kLanguagePreferredLanguages[] =
     "settings.language.preferred_languages";
-const char kLanguagePreferredLanguagesSyncable[] =
-    "settings.language.preferred_languages_syncable";
 
 // A string pref (comma-separated list) set to the preloaded (active) input
 // method IDs (ex. "pinyin,mozc").
 const char kLanguagePreloadEngines[] = "settings.language.preload_engines";
-const char kLanguagePreloadEnginesSyncable[] =
-    "settings.language.preload_engines_syncable";
 
-// A string pref (comma-separated list) set to the extension IMEs to be enabled.
+// A List pref (comma-separated list) set to the extension IMEs to be enabled.
 const char kLanguageEnabledExtensionImes[] =
     "settings.language.enabled_extension_imes";
-const char kLanguageEnabledExtensionImesSyncable[] =
-    "settings.language.enabled_extension_imes_syncable";
-
-// A boolean pref to indicate whether we still need to add the globally synced
-// input methods. False after the initial post-OOBE sync.
-const char kLanguageShouldMergeInputMethods[] =
-    "settings.language.merge_input_methods";
 
 // Integer prefs which determine how we remap modifier keys (e.g. swap Alt and
 // Control.) Possible values for these prefs are 0-4. See ModifierKey enum in
 // src/chrome/browser/chromeos/input_method/xkeyboard.h
 const char kLanguageRemapSearchKeyTo[] =
     // Note: we no longer use XKB for remapping these keys, but we can't change
     // the pref names since the names are already synced with the cloud.
     "settings.language.xkb_remap_search_key_to";
 const char kLanguageRemapControlKeyTo[] =
     "settings.language.xkb_remap_control_key_to";
@@ skipping 1715 matching lines @@
 // bubble.
 const char kPasswordBubbleTimeStamp[] = "password_bubble.timestamp";
 
 // The count of user's "Nope" for the password bubble.
 const char kPasswordBubbleNopesCount[] = "password_bubble.nopes";
 
 // Last user's interaction with the password bubble.
 const char kPasswordBubbleLastInteractions[] = "password_bubble.interactions";
 
 }  // namespace prefs