Revert 173477

chrome/browser/chromeos/input_method/ibus_controller_impl.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_CHROMEOS_INPUT_METHOD_IBUS_CONTROLLER_IMPL_H_
 #define CHROME_BROWSER_CHROMEOS_INPUT_METHOD_IBUS_CONTROLLER_IMPL_H_
 
 #include <gio/gio.h>  // GAsyncResult and related types.
 
 #include <string>
 #include <vector>
 
-#include "base/memory/ref_counted.h"
 #include "base/process_util.h"
 #include "chrome/browser/chromeos/input_method/ibus_controller_base.h"
 #include "chrome/browser/chromeos/input_method/input_method_whitelist.h"
 #include "chromeos/dbus/ibus/ibus_panel_service.h"
 
-namespace base {
-class SequencedTaskRunner;
-}  // namespace base
-
 namespace ui {
 class InputMethodIBus;
 }  // namespace ui
 
 namespace chromeos {
 namespace input_method {
 
 struct InputMethodConfigValue;
 struct InputMethodProperty;
 typedef std::vector<InputMethodProperty> InputMethodPropertyList;
 
 // The IBusController implementation.
 class IBusControllerImpl : public IBusControllerBase,
                            public ibus::IBusPanelPropertyHandlerInterface {
  public:
-  // Creates an IBusController. All public methods must be invoked in the
-  // context of |default_task_runner|. |worker_task_runner| will be used to
-  // execute potentially blocking file tasks.
-  IBusControllerImpl(
-      const scoped_refptr<base::SequencedTaskRunner>& default_task_runner,
-      const scoped_refptr<base::SequencedTaskRunner>& worker_task_runner);
+  IBusControllerImpl();
   virtual ~IBusControllerImpl();
 
   // IBusController overrides:
   virtual bool Start() OVERRIDE;
   virtual void Reset() OVERRIDE;
   virtual bool Stop() OVERRIDE;
   virtual bool ChangeInputMethod(const std::string& id) OVERRIDE;
   virtual bool ActivateInputMethodProperty(const std::string& key) OVERRIDE;
 
   // Calls <anonymous_namespace>::FindAndUpdateProperty. This method is just for
   // unit testing.
   static bool FindAndUpdatePropertyForTesting(
       const InputMethodProperty& new_prop,
       InputMethodPropertyList* prop_list);
 
+  static void IBusDaemonInitializationDone(IBusControllerImpl* controller,
+                                           const std::string& ibus_address);
+
  private:
   enum IBusDaemonStatus{
     IBUS_DAEMON_INITIALIZING,
     IBUS_DAEMON_RUNNING,
     IBUS_DAEMON_SHUTTING_DOWN,
     IBUS_DAEMON_STOP,
   };
 
   // IBusControllerBase overrides:
   virtual bool SetInputMethodConfigInternal(
@@ skipping 26 matching lines @@
                      base::ProcessHandle* process_handle,
                      GChildWatchFunc watch_func);
 
   // Returns pointer to InputMethod object.
   ui::InputMethodIBus* GetInputMethod();
 
   // Injects an alternative ui::InputMethod for testing.
   // The injected object must be released by caller.
   void set_input_method_for_testing(ui::InputMethodIBus* input_method);
 
-  // Receives a notification on a worker thread and posts a call to
-  // IBusDaemonInitializationDone on the default task runner.
-  void IBusDaemonInitializationDoneWorkerCallback(
-      const std::string& ibus_address);
-
-  void IBusDaemonInitializationDone(const std::string& ibus_address);
-
   // Called when the IBusConfigClient is initialized.
   void OnIBusConfigClientInitialized();
 
   // Called when the input method process is shut down.
   static void OnIBusDaemonExit(GPid pid,
                                gint status,
                                IBusControllerImpl* controller);
 
   // The current ibus_daemon address. This value is assigned at the launching
   // ibus-daemon and used in bus connection initialization.
@@ skipping 12 matching lines @@
 
   // An object which knows all valid input methods and layout IDs.
   InputMethodWhitelist whitelist_;
 
   // Represents ibus-daemon's status.
   IBusDaemonStatus ibus_daemon_status_;
 
   // The pointer to global input method. We can inject this value for testing.
   ui::InputMethodIBus* input_method_;
 
-  scoped_refptr<base::SequencedTaskRunner> default_task_runner_;
-  scoped_refptr<base::SequencedTaskRunner> worker_task_runner_;
-
   // Used for making callbacks for PostTask.
   base::WeakPtrFactory<IBusControllerImpl> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(IBusControllerImpl);
 };
 
 }  // namespace input_method
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_INPUT_METHOD_IBUS_CONTROLLER_IMPL_H_