Revert 165919 - Extends DBusThreadManger to handle IBusPanelService

BUG=158264
TEST=ran chromeos_unittests, unit_tests

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

TBR=nona@chromium.org
Review URL: https://codereview.chromium.org/11363077

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

5 files changed, 0 insertions, 29 deletions

diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc
index 16489b4..d689f3c 100644
--- a/chromeos/dbus/dbus_thread_manager.cc
+++ b/chromeos/dbus/dbus_thread_manager.cc
@@ -34,7 +34,6 @@
 #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"
-#include "chromeos/dbus/ibus/ibus_panel_service.h"
 #include "chromeos/dbus/image_burner_client.h"
 #include "chromeos/dbus/introspectable_client.h"
 #include "chromeos/dbus/modem_messaging_client.h"
@@ -211,10 +210,6 @@ class DBusThreadManagerImpl : public DBusThreadManager {
     ibus_engine_factory_service_.reset(
         IBusEngineFactoryService::Create(ibus_bus_.get(), client_type));
 
-    // Create the ibus panel service.
-    ibus_panel_service_.reset(
-        IBusPanelService::Create(client_type, ibus_bus_.get()));
-
     ibus_engine_services_.clear();
   }
 
@@ -400,11 +395,6 @@ class DBusThreadManagerImpl : public DBusThreadManager {
     ibus_engine_services_.erase(object_path);
   }
 
-  // DBusThreadManager override.
-  virtual IBusPanelService* GetIBusPanelService() OVERRIDE {
-    return ibus_panel_service_.get();
-  }
-
   scoped_ptr<base::Thread> dbus_thread_;
   scoped_refptr<dbus::Bus> system_bus_;
   scoped_refptr<dbus::Bus> ibus_bus_;
@@ -438,7 +428,6 @@ class DBusThreadManagerImpl : public DBusThreadManager {
   scoped_ptr<IBusInputContextClient> ibus_input_context_client_;
   scoped_ptr<IBusEngineFactoryService> ibus_engine_factory_service_;
   std::map<dbus::ObjectPath, IBusEngineService*> ibus_engine_services_;
-  scoped_ptr<IBusPanelService> ibus_panel_service_;
 
   std::string ibus_address_;
 
diff --git a/chromeos/dbus/dbus_thread_manager.h b/chromeos/dbus/dbus_thread_manager.h
index fdd6a0a..3de095f 100644
--- a/chromeos/dbus/dbus_thread_manager.h
+++ b/chromeos/dbus/dbus_thread_manager.h
@@ -40,7 +40,6 @@ class IBusClient;
 class IBusEngineFactoryService;
 class IBusEngineService;
 class IBusInputContextClient;
-class IBusPanelService;
 class ImageBurnerClient;
 class IntrospectableClient;
 class ModemMessagingClient;
@@ -259,10 +258,6 @@ class CHROMEOS_EXPORT DBusThreadManager {
   // Removes the ibus engine services for |object_path|.
   virtual void RemoveIBusEngineService(const dbus::ObjectPath& object_path) = 0;
 
-  // Returns the ibus panel service, owned by DBusThreadManager. Do not cache
-  // this pointer and use it after DBusThreadManager is shut down.
-  virtual IBusPanelService* GetIBusPanelService() = 0;
-
   virtual ~DBusThreadManager();
 
  protected:
diff --git a/chromeos/dbus/mock_dbus_thread_manager.h b/chromeos/dbus/mock_dbus_thread_manager.h
index 40ed296..2cb5372b 100644
--- a/chromeos/dbus/mock_dbus_thread_manager.h
+++ b/chromeos/dbus/mock_dbus_thread_manager.h
@@ -93,7 +93,6 @@ class MockDBusThreadManager : public DBusThreadManager {
                IBusEngineService*(const dbus::ObjectPath& object_path));
   MOCK_METHOD1(RemoveIBusEngineService,
                void(const dbus::ObjectPath& object_path));
-  MOCK_METHOD0(GetIBusPanelService, IBusPanelService*(void));
 
   MockBluetoothAdapterClient* mock_bluetooth_adapter_client() {
     return mock_bluetooth_adapter_client_.get();
diff --git a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc
index 436170a..4f3d0d9 100644
--- a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc
+++ b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc
@@ -9,7 +9,6 @@
 #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"
-#include "chromeos/dbus/ibus/mock_ibus_panel_service.h"
 
 namespace chromeos {
 
@@ -220,8 +219,4 @@ void MockDBusThreadManagerWithoutGMock::RemoveIBusEngineService(
     const dbus::ObjectPath& object_path) {
 }
 
-IBusPanelService* MockDBusThreadManagerWithoutGMock::GetIBusPanelService() {
-  return mock_ibus_panel_service_.get();
-}
-
 }  // namespace chromeos
diff --git a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
index e8c0b37..930ec19 100644
--- a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
+++ b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
@@ -23,7 +23,6 @@ class MockIBusClient;
 class MockIBusEngineFactoryService;
 class MockIBusEngineService;
 class MockIBusInputContextClient;
-class MockIBusPanelService;
 
 // This class provides an another mock DBusThreadManager without gmock
 // dependency. This class is used only for places where GMock is not allowed
@@ -72,7 +71,6 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager {
       const dbus::ObjectPath& object_path) OVERRIDE;
   virtual void RemoveIBusEngineService(
       const dbus::ObjectPath& object_path) OVERRIDE;
-  virtual IBusPanelService* GetIBusPanelService() OVERRIDE;
 
   MockIBusClient* mock_ibus_client() {
     return mock_ibus_client_.get();
@@ -90,10 +88,6 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager {
     return mock_ibus_engine_factory_service_.get();
   }
 
-  MockIBusPanelService* mock_ibus_panel_service() {
-    return mock_ibus_panel_service_.get();
-  }
-
   void set_ibus_bus(dbus::Bus* ibus_bus) {
     ibus_bus_ = ibus_bus;
   }
@@ -103,7 +97,6 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager {
   scoped_ptr<MockIBusInputContextClient> mock_ibus_input_context_client_;
   scoped_ptr<MockIBusEngineService> mock_ibus_engine_service_;
   scoped_ptr<MockIBusEngineFactoryService> mock_ibus_engine_factory_service_;
-  scoped_ptr<MockIBusPanelService> mock_ibus_panel_service_;
 
   dbus::Bus* ibus_bus_;