Delete IBusEngineFactoryService.

chrome/browser/chromeos/input_method/input_method_engine_ibus.h

Index: chrome/browser/chromeos/input_method/input_method_engine_ibus.h
diff --git a/chrome/browser/chromeos/input_method/input_method_engine_ibus.h b/chrome/browser/chromeos/input_method/input_method_engine_ibus.h
index e59ee82ed3340294d2af7bdd222cdc8d69162519..9b0cd93bc3fa3928db1629fc6681c53ba4f51dd6 100644
--- a/chrome/browser/chromeos/input_method/input_method_engine_ibus.h
+++ b/chrome/browser/chromeos/input_method/input_method_engine_ibus.h
@@ -8,6 +8,7 @@
 #include <map>
 #include <string>
 #include <vector>
+#include "base/memory/weak_ptr.h"
 #include "chrome/browser/chromeos/input_method/input_method_engine.h"
 #include "chromeos/ime/ibus_bridge.h"
 #include "dbus/object_path.h"
@@ -16,7 +17,6 @@ namespace chromeos {
 
 class IBusText;
 
-class IBusEngineFactoryService;
 class IBusEngineService;
 
 namespace input_method {
@@ -108,10 +108,9 @@ class InputMethodEngineIBus : public InputMethodEngine,
   // Registers the engine component.
   void RegisterComponent();
 
-  // Called when the ibus-daemon sends CreateEngine message with corresponding
-  // engine id.
-  void CreateEngineHandler(
-      const IBusEngineFactoryService::CreateEngineResponseSender& sender);
+  // Called when the IBusBrige executes CreateEngine with
+  // corresponding engine id.
+  void CreateEngineHandler();
 
   // Returns current IBusEngineService, if there is no available service, this
   // function returns NULL.
@@ -135,8 +134,8 @@ class InputMethodEngineIBus : public InputMethodEngine,
   // This IME ID in ibus.
   std::string ibus_id_;
 
-  // The current object path.
-  dbus::ObjectPath object_path_;
+  // Flag whether CreateEngineHandler is called or not.
+  bool is_create_engine_handler_called_;

[Seigo Nonaka, 2013/11/12 03:37:22]

I'm curious about this flag.

Why do we check the CreateEngineHandler is called or not?
CreateEngineHandler does no longer make sense because each Engine instances
keeps alive during user session. We just switch the activated instance with the
SetGlobalEngine call.
Can we just check |active_| instead of this flag?

[Hiro Komatsu, 2013/11/12 05:01:39]

I just focused on the deletion of IBusEngineFactoryService keeping the current
logic as-is.  object_path_ was checked if it was empty or not, so I tried to
keep this logic using a bool variable instead of object_path_.

So please let me change the logic you suggested, after deleting
IBusEngineFactoryService.

 
   // The current auxialy text and it's visiblity.
   scoped_ptr<IBusText> aux_text_;
@@ -165,7 +164,6 @@ class InputMethodEngineIBus : public InputMethodEngine,
   std::map<int, int> candidate_indexes_;
 
   scoped_ptr<IBusEngineService> ibus_engine_service_;
-  scoped_ptr<IBusEngineFactoryService> ibus_engine_factory_service_;
 
   // Used for making callbacks.
   base::WeakPtrFactory<InputMethodEngineIBus> weak_ptr_factory_;