Extract a delegate interface from c/b/chromeos/input_method to permit decoupling from c/b.

BUG=164375

Review URL: https://chromiumcodereview.appspot.com/11415266

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@172140 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 6 deletions

diff --git a/chrome/browser/chromeos/input_method/input_method_manager_impl.h b/chrome/browser/chromeos/input_method/input_method_manager_impl.h
index 7014ef74..49f4dde 100644
--- a/chrome/browser/chromeos/input_method/input_method_manager_impl.h
+++ b/chrome/browser/chromeos/input_method/input_method_manager_impl.h
@@ -22,12 +22,14 @@
 namespace chromeos {
 class InputMethodEngineIBus;
 namespace input_method {
+class InputMethodDelegate;
 
 // The implementation of InputMethodManager.
 class InputMethodManagerImpl : public InputMethodManager,
                                public CandidateWindowController::Observer,
                                public IBusController::Observer {
  public:
+  explicit InputMethodManagerImpl(scoped_ptr<InputMethodDelegate> delegate);
   virtual ~InputMethodManagerImpl();
 
   // InputMethodManager override:
@@ -80,14 +82,8 @@ class InputMethodManagerImpl : public InputMethodManager,
   // Sets |xkeyboard_|.
   void SetXKeyboardForTesting(XKeyboard* xkeyboard);
 
-  // Creates a new instance of this class. The caller has to delete the returned
-  // object. The caller also have to set a mock CandidateWindowController,
-  // IBusController, and XKeyboard. See the setters above.
-  static InputMethodManagerImpl* GetInstanceForTesting();
-
  private:
   friend class InputMethodManager;
-  InputMethodManagerImpl();
 
   // IBusController overrides:
   virtual void PropertyChanged() OVERRIDE;
@@ -135,6 +131,8 @@ class InputMethodManagerImpl : public InputMethodManager,
   void ChangeInputMethodInternal(const std::string& input_method_id,
                                  bool show_message);
 
+  scoped_ptr<InputMethodDelegate> delegate_;
+
   // The current browser status.
   State state_;