Updates the whitelisted XKB input method IDs to sync up with the component XKB extension.

chrome/browser/chromeos/input_method/input_method_util.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/browser/chromeos/input_method/input_method_util.h"
 
 #include <algorithm>
 #include <functional>
 #include <map>
 #include <utility>
@@ skipping 782 matching lines @@
   return hardware_login_layouts_;
 }
 
 bool InputMethodUtil::IsLoginKeyboard(const std::string& input_method_id)
     const {
   const InputMethodDescriptor* ime =
       GetInputMethodDescriptorFromId(input_method_id);
   return ime ? ime->is_login_keyboard() : false;
 }
 
-void InputMethodUtil::SetComponentExtensions(
-    const InputMethodDescriptors& imes) {
+void InputMethodUtil::AppendInputMethods(const InputMethodDescriptors& imes) {
   for (size_t i = 0; i < imes.size(); ++i) {
     const InputMethodDescriptor& input_method = imes[i];
     DCHECK(!input_method.language_codes().empty());
     const std::vector<std::string>& language_codes =
         input_method.language_codes();
     id_to_language_code_[input_method.id()] = language_codes[0];
     id_to_descriptor_[input_method.id()] = input_method;
 
     typedef LanguageCodeToIdsMap::const_iterator It;
     for (size_t j = 0; j < language_codes.size(); ++j) {
       std::pair<It, It> range =
           language_code_to_ids_.equal_range(language_codes[j]);
       It it = range.first;
       for (; it != range.second; ++it) {
         if (it->second == input_method.id())
           break;
       }
       if (it == range.second)
         language_code_to_ids_.insert(
             std::make_pair(language_codes[j], input_method.id()));
     }
   }
 }
 
+void InputMethodUtil::ResetInputMethods(const InputMethodDescriptors& imes) {
+  // Clear the existing maps.
+  language_code_to_ids_.clear();
+  id_to_language_code_.clear();
+  id_to_descriptor_.clear();
+
+  AppendInputMethods(imes);
+}
+
 void InputMethodUtil::InitXkbInputMethodsForTesting() {
   cached_hardware_layouts_.clear();
   if (!extension_ime_util::UseWrappedExtensionKeyboardLayouts())
     return;
   scoped_ptr<InputMethodDescriptors> original_imes =
       InputMethodWhitelist().GetSupportedInputMethods();
   InputMethodDescriptors whitelist_imes;
   for (size_t i = 0; i < original_imes->size(); ++i) {
     const InputMethodDescriptor& ime = (*original_imes)[i];
     whitelist_imes.push_back(InputMethodDescriptor(
         extension_ime_util::GetInputMethodIDByKeyboardLayout(ime.id()),
         "",
         ime.indicator(),
         ime.keyboard_layouts(),
         ime.language_codes(),
         ime.is_login_keyboard(),
         ime.options_page_url(),
         ime.input_view_url()));
   }
-  SetComponentExtensions(whitelist_imes);
+  ResetInputMethods(whitelist_imes);
 }
 
 InputMethodDescriptor InputMethodUtil::GetFallbackInputMethodDescriptor() {
   std::vector<std::string> layouts;
   layouts.push_back("us");
   std::vector<std::string> languages;
   languages.push_back("en-US");
   return InputMethodDescriptor(
       extension_ime_util::GetInputMethodIDByKeyboardLayout("xkb:us::eng"),
       "",
@@ skipping 40 matching lines @@
           std::make_pair(language_codes[i], input_method_id));
       // Remember the pairs.
       id_to_language_code_.insert(
           std::make_pair(input_method_id, language_codes[i]));
     }
   }
 }
 
 }  // namespace input_method
 }  // namespace chromeos