Remove libibus dependency from config relate stuff.

Most of connection management stuff is moved to chromeos/dbus/ibus/ibus_config_client

This CL depends https://codereview.chromium.org/11413165/

BUG=158265
TEST=Manually done on lumpy

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

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

5 files changed, 23 insertions, 0 deletions

diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc
index f72e6a0..ff712e6 100644
--- a/chromeos/dbus/dbus_thread_manager.cc
+++ b/chromeos/dbus/dbus_thread_manager.cc
@@ -30,6 +30,7 @@
 #include "chromeos/dbus/shill_service_client.h"
 #include "chromeos/dbus/gsm_sms_client.h"
 #include "chromeos/dbus/ibus/ibus_client.h"
+#include "chromeos/dbus/ibus/ibus_config_client.h"
 #include "chromeos/dbus/ibus/ibus_engine_factory_service.h"
 #include "chromeos/dbus/ibus/ibus_engine_service.h"
 #include "chromeos/dbus/ibus/ibus_input_context_client.h"
@@ -183,6 +184,8 @@ class DBusThreadManagerImpl : public DBusThreadManager {
 
     ibus_client_.reset(
         IBusClient::Create(client_type, ibus_bus_.get()));
+    ibus_config_client_.reset(
+        IBusConfigClient::Create(client_type, ibus_bus_.get()));
     ibus_input_context_client_.reset(
         IBusInputContextClient::Create(client_type));
     ibus_engine_factory_service_.reset(
@@ -310,6 +313,10 @@ class DBusThreadManagerImpl : public DBusThreadManager {
     return ibus_client_.get();
   }
 
+  virtual IBusConfigClient* GetIBusConfigClient() OVERRIDE {
+    return ibus_config_client_.get();
+  }
+
   virtual IBusInputContextClient* GetIBusInputContextClient() OVERRIDE {
     return ibus_input_context_client_.get();
   }
@@ -377,6 +384,7 @@ class DBusThreadManagerImpl : public DBusThreadManager {
   scoped_ptr<SpeechSynthesizerClient> speech_synthesizer_client_;
   scoped_ptr<UpdateEngineClient> update_engine_client_;
   scoped_ptr<IBusClient> ibus_client_;
+  scoped_ptr<IBusConfigClient> ibus_config_client_;
   scoped_ptr<IBusInputContextClient> ibus_input_context_client_;
   scoped_ptr<IBusEngineFactoryService> ibus_engine_factory_service_;
   std::map<dbus::ObjectPath, IBusEngineService*> ibus_engine_services_;
diff --git a/chromeos/dbus/dbus_thread_manager.h b/chromeos/dbus/dbus_thread_manager.h
index 41afbc1..1d867e19 100644
--- a/chromeos/dbus/dbus_thread_manager.h
+++ b/chromeos/dbus/dbus_thread_manager.h
@@ -36,6 +36,7 @@ class CryptohomeClient;
 class DebugDaemonClient;
 class GsmSMSClient;
 class IBusClient;
+class IBusConfigClient;
 class IBusEngineFactoryService;
 class IBusEngineService;
 class IBusInputContextClient;
@@ -131,6 +132,7 @@ class CHROMEOS_EXPORT DBusThreadManager {
   virtual DebugDaemonClient* GetDebugDaemonClient() = 0;
   virtual GsmSMSClient* GetGsmSMSClient() = 0;
   virtual IBusClient* GetIBusClient() = 0;
+  virtual IBusConfigClient* GetIBusConfigClient() = 0;
   virtual IBusEngineFactoryService* GetIBusEngineFactoryService() = 0;
   virtual IBusEngineService* GetIBusEngineService(
       const dbus::ObjectPath& object_path) = 0;
diff --git a/chromeos/dbus/mock_dbus_thread_manager.h b/chromeos/dbus/mock_dbus_thread_manager.h
index 7426b59..053c6d4 100644
--- a/chromeos/dbus/mock_dbus_thread_manager.h
+++ b/chromeos/dbus/mock_dbus_thread_manager.h
@@ -87,6 +87,7 @@ class MockDBusThreadManager : public DBusThreadManager {
   MOCK_METHOD0(GetSpeechSynthesizerClient, SpeechSynthesizerClient*(void));
   MOCK_METHOD0(GetUpdateEngineClient, UpdateEngineClient*(void));
   MOCK_METHOD0(GetIBusClient, IBusClient*(void));
+  MOCK_METHOD0(GetIBusConfigClient, IBusConfigClient*(void));
   MOCK_METHOD0(GetIBusInputContextClient, IBusInputContextClient*(void));
   MOCK_METHOD0(GetIBusEngineFactoryService, IBusEngineFactoryService*(void));
   MOCK_METHOD1(GetIBusEngineService,
diff --git a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc
index 424392b..61e751c 100644
--- a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc
+++ b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc
@@ -6,6 +6,7 @@
 
 #include "chromeos/dbus/dbus_thread_manager_observer.h"
 #include "chromeos/dbus/ibus/mock_ibus_client.h"
+#include "chromeos/dbus/ibus/mock_ibus_config_client.h"
 #include "chromeos/dbus/ibus/mock_ibus_engine_factory_service.h"
 #include "chromeos/dbus/ibus/mock_ibus_engine_service.h"
 #include "chromeos/dbus/ibus/mock_ibus_input_context_client.h"
@@ -202,6 +203,10 @@ IBusClient* MockDBusThreadManagerWithoutGMock::GetIBusClient() {
   return mock_ibus_client_.get();
 }
 
+IBusConfigClient* MockDBusThreadManagerWithoutGMock::GetIBusConfigClient() {
+  return mock_ibus_config_client_.get();
+}
+
 IBusInputContextClient*
     MockDBusThreadManagerWithoutGMock::GetIBusInputContextClient() {
   return mock_ibus_input_context_client_.get();
diff --git a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
index 136dd1e..a9f093e 100644
--- a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
+++ b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
@@ -20,6 +20,7 @@ namespace chromeos {
 
 class DBusThreadManagerObserver;
 class MockIBusClient;
+class MockIBusConfigClient;
 class MockIBusEngineFactoryService;
 class MockIBusEngineService;
 class MockIBusInputContextClient;
@@ -66,6 +67,7 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager {
   virtual UpdateEngineClient* GetUpdateEngineClient() OVERRIDE;
   virtual BluetoothOutOfBandClient* GetBluetoothOutOfBandClient() OVERRIDE;
   virtual IBusClient* GetIBusClient() OVERRIDE;
+  virtual IBusConfigClient* GetIBusConfigClient() OVERRIDE;
   virtual IBusInputContextClient* GetIBusInputContextClient() OVERRIDE;
   virtual IBusEngineFactoryService* GetIBusEngineFactoryService() OVERRIDE;
   virtual IBusEngineService* GetIBusEngineService(
@@ -78,6 +80,10 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager {
     return mock_ibus_client_.get();
   }
 
+  MockIBusConfigClient* mock_ibus_config_client() {
+    return mock_ibus_config_client_.get();
+  }
+
   MockIBusInputContextClient* mock_ibus_input_context_client() {
     return mock_ibus_input_context_client_.get();
   }
@@ -100,6 +106,7 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager {
 
  private:
   scoped_ptr<MockIBusClient> mock_ibus_client_;
+  scoped_ptr<MockIBusConfigClient> mock_ibus_config_client_;
   scoped_ptr<MockIBusInputContextClient> mock_ibus_input_context_client_;
   scoped_ptr<MockIBusEngineService> mock_ibus_engine_service_;
   scoped_ptr<MockIBusEngineFactoryService> mock_ibus_engine_factory_service_;