Revert r196352 "dbus: Add FakeBus"

chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc

 // 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.
 
 #include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h"
 
 #include "chromeos/dbus/dbus_thread_manager_observer.h"
 #include "chromeos/dbus/fake_bluetooth_adapter_client.h"
 #include "chromeos/dbus/fake_bluetooth_agent_manager_client.h"
 #include "chromeos/dbus/fake_bluetooth_device_client.h"
 #include "chromeos/dbus/fake_bluetooth_input_client.h"
 #include "chromeos/dbus/fake_bluetooth_profile_manager_client.h"
 #include "chromeos/dbus/fake_cros_disks_client.h"
 #include "chromeos/dbus/fake_shill_manager_client.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"
 #include "chromeos/dbus/ibus/mock_ibus_panel_service.h"
-#include "dbus/fake_bus.h"
 
 namespace chromeos {
 
 MockDBusThreadManagerWithoutGMock::MockDBusThreadManagerWithoutGMock()
   : fake_bluetooth_adapter_client_(new FakeBluetoothAdapterClient()),
     fake_bluetooth_agent_manager_client_(new FakeBluetoothAgentManagerClient()),
     fake_bluetooth_device_client_(new FakeBluetoothDeviceClient()),
     fake_bluetooth_input_client_(new FakeBluetoothInputClient()),
     fake_bluetooth_profile_manager_client_(
         new FakeBluetoothProfileManagerClient()),
@@ skipping 21 matching lines @@
 
 void MockDBusThreadManagerWithoutGMock::RemoveObserver(
     DBusThreadManagerObserver* observer) {
   DCHECK(observer);
   observers_.RemoveObserver(observer);
 }
 
 void MockDBusThreadManagerWithoutGMock::InitIBusBus(
     const std::string& ibus_address,
     const base::Closure& closure) {
-  dbus::Bus::Options options;
-  ibus_bus_ = new dbus::FakeBus(options);
+  // Non-null bus address is used to ensure the connection to ibus-daemon.
+  ibus_bus_ = reinterpret_cast<dbus::Bus*>(0xdeadbeef);
 }
 
 dbus::Bus* MockDBusThreadManagerWithoutGMock::GetSystemBus() {
   return NULL;
 }
 
 dbus::Bus* MockDBusThreadManagerWithoutGMock::GetIBusBus() {
   return ibus_bus_;
 }
 
@@ skipping 193 matching lines @@
 
 void MockDBusThreadManagerWithoutGMock::RemoveIBusEngineService(
     const dbus::ObjectPath& object_path) {
 }
 
 IBusPanelService* MockDBusThreadManagerWithoutGMock::GetIBusPanelService() {
   return mock_ibus_panel_service_.get();
 }
 
 }  // namespace chromeos