Move the InputComponents out of extensions entirely.

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

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_INPUT_IME_INPUT_IME_API_H_
 #define CHROME_BROWSER_EXTENSIONS_API_INPUT_IME_INPUT_IME_API_H_
 
 #include <map>
 #include <string>
 #include <vector>
 
 #include "base/memory/singleton.h"
 #include "base/values.h"
 #include "chrome/browser/chromeos/input_method/input_method_engine.h"
+#include "chrome/browser/extensions/api/profile_keyed_api_factory.h"
 #include "chrome/browser/extensions/extension_function.h"
 #include "chrome/browser/profiles/profile_keyed_service.h"
+#include "chrome/common/extensions/api/input_ime/input_components_handler.h"
 #include "chrome/common/extensions/extension.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
 class Profile;
 
 namespace chromeos {
 class InputMethodEngine;
 class ImeObserver;
 }
 
 namespace extensions {
 
 class InputImeEventRouter {
  public:
   static InputImeEventRouter* GetInstance();
 
   bool RegisterIme(Profile* profile,
                    const std::string& extension_id,
-                   const extensions::Extension::InputComponentInfo& component);
+                   const extensions::InputComponentInfo& component);
   void UnregisterAllImes(Profile* profile, const std::string& extension_id);
   chromeos::InputMethodEngine* GetEngine(const std::string& extension_id,
                                          const std::string& engine_id);
   chromeos::InputMethodEngine* GetActiveEngine(const std::string& extension_id);
 
 
   // Called when a key event was handled.
   void OnKeyEventHandled(const std::string& extension_id,
                          const std::string& request_id,
                          bool handled);
@@ skipping 117 matching lines @@
  public:
   DECLARE_EXTENSION_FUNCTION_NAME("input.ime.keyEventHandled");
 
  protected:
   virtual ~KeyEventHandled() {}
 
   // ExtensionFunction:
   virtual bool RunImpl() OVERRIDE;
 };
 
-class InputImeAPI : public ProfileKeyedService,
+class InputImeAPI : public ProfileKeyedAPI,
                     public content::NotificationObserver {
  public:
   explicit InputImeAPI(Profile* profile);
   virtual ~InputImeAPI();
 
   // content::NotificationObserver implementation.
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
  private:
+  friend class ProfileKeyedAPIFactory<InputImeAPI>;
   InputImeEventRouter* input_ime_event_router();
 
+  // ProfileKeyedAPI implementation.
+  static const char* service_name() {
+    return "InputImeAPI";
+  }
+  static const bool kServiceIsNULLWhileTesting = true;
+
   Profile* const profile_;
   content::NotificationRegistrar registrar_;
 };
 
+template <>
+ProfileKeyedAPIFactory<InputImeAPI>*
+ProfileKeyedAPIFactory<InputImeAPI>::GetInstance();
+
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_INPUT_IME_INPUT_IME_API_H_