Use libcros to convert input method ID to keyboard overlay ID.

chrome/browser/chromeos/input_method/input_method_util.cc

Index: chrome/browser/chromeos/input_method/input_method_util.cc
diff --git a/chrome/browser/chromeos/input_method/input_method_util.cc b/chrome/browser/chromeos/input_method/input_method_util.cc
index 67fcb5bb55da26f780305e300805b197a013e10f..d187bbbeac8220f86417ef756bc2a59326557c9e 100644
--- a/chrome/browser/chromeos/input_method/input_method_util.cc
+++ b/chrome/browser/chromeos/input_method/input_method_util.cc
@@ -109,7 +109,6 @@ struct IdMaps {
   scoped_ptr<LanguageCodeToIdsMap> language_code_to_ids;
   scoped_ptr<std::map<std::string, std::string> > id_to_language_code;
   scoped_ptr<std::map<std::string, std::string> > id_to_display_name;
-  scoped_ptr<std::map<std::string, std::string> > id_to_keyboard_overlay_id;
 
   // Returns the singleton instance.
   static IdMaps* GetInstance() {
@@ -129,7 +128,6 @@ struct IdMaps {
     language_code_to_ids->clear();
     id_to_language_code->clear();
     id_to_display_name->clear();
-    id_to_keyboard_overlay_id->clear();
 
     // Build the id to descriptor map for handling kExtraLanguages later.
     typedef std::map<std::string,
@@ -147,13 +145,6 @@ struct IdMaps {
           std::make_pair(input_method.id, &input_method));
     }
 
-    for (size_t i = 0; i < arraysize(kInputMethodIdToKeyboardOverlayId); ++i) {
-      InputMethodIdToKeyboardOverlayId id_pair =
-          kInputMethodIdToKeyboardOverlayId[i];
-      id_to_keyboard_overlay_id->insert(
-          std::make_pair(id_pair.input_method_id, id_pair.keyboard_overlay_id));
-    }
-
     // Go through the languages listed in kExtraLanguages.
     using chromeos::input_method::kExtraLanguages;
     for (size_t i = 0; i < arraysize(kExtraLanguages); ++i) {
@@ -172,8 +163,7 @@ struct IdMaps {
  private:
   IdMaps() : language_code_to_ids(new LanguageCodeToIdsMap),
              id_to_language_code(new std::map<std::string, std::string>),
-             id_to_display_name(new std::map<std::string, std::string>),
-             id_to_keyboard_overlay_id(new std::map<std::string, std::string>) {
+             id_to_display_name(new std::map<std::string, std::string>) {
     ReloadMaps();
   }
 
@@ -561,14 +551,6 @@ std::string GetKeyboardLayoutName(const std::string& input_method_id) {
   return (splitted_id.size() > 1) ? splitted_id[1] : "";
 }
 
-std::string GetKeyboardOverlayId(const std::string& input_method_id) {
-  const std::map<std::string, std::string>& id_map =
-      *(IdMaps::GetInstance()->id_to_keyboard_overlay_id);
-  std::map<std::string, std::string>::const_iterator iter =
-      id_map.find(input_method_id);
-  return (iter == id_map.end() ? "" : iter->second);
-}
-
 std::string GetInputMethodDisplayNameFromId(
     const std::string& input_method_id) {
   static const char kDefaultDisplayName[] = "USA";