Refactoring for InputMethodEngine and InputMethodEventRouter.

chrome/browser/extensions/api/input_ime/input_ime_api.h

Index: chrome/browser/extensions/api/input_ime/input_ime_api.h
diff --git a/chrome/browser/extensions/api/input_ime/input_ime_api.h b/chrome/browser/extensions/api/input_ime/input_ime_api.h
index 773d13b4ae0b877af329677d7d181475161db73e..ac7f07d4c74897973cedd5145ab0f22d7b9197a4 100644
--- a/chrome/browser/extensions/api/input_ime/input_ime_api.h
+++ b/chrome/browser/extensions/api/input_ime/input_ime_api.h
@@ -36,8 +36,9 @@ class InputImeEventRouter {
  public:
   static InputImeEventRouter* GetInstance();
 
-  bool RegisterIme(const std::string& extension_id,
-                   const extensions::InputComponentInfo& component);
+  bool RegisterImeExtension(
+      const std::string& extension_id,
+      const std::vector<extensions::InputComponentInfo>& input_components);
   void UnregisterAllImes(const std::string& extension_id);
   chromeos::InputMethodEngineInterface* GetEngine(
       const std::string& extension_id,
@@ -62,15 +63,7 @@ class InputImeEventRouter {
   InputImeEventRouter();
   ~InputImeEventRouter();
 
-  // The engine map for event routing.
-  //   { Profile : { extension_id : { engine_id : Engine } } }.
-  // TODO(shuchen): reuse the engine map in InputMethodManagerImpl.
-  typedef std::map<std::string, chromeos::InputMethodEngineInterface*>
-      EngineMap;
-  typedef std::map<std::string, EngineMap> ExtensionMap;
-  typedef std::map<Profile*, ExtensionMap, ProfileCompare>
-      ProfileEngineMap;
-  ProfileEngineMap profile_engine_map_;
+  std::map<std::string, chromeos::InputMethodEngineInterface*> engine_map_;
 
   unsigned int next_request_id_;
   RequestMap request_map_;