dbus: Use stubs for some clients and utils for MockDBusThreadManagerWithoutGMock

chromeos/dbus/mock_dbus_thread_manager_without_gmock.h

Index: chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
diff --git a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
index 7d16dc5ea83e5f86f0b3c2bfddab224a0f8f5f20..56632107279d5ce2b1fecccba1e0fc5461d77832 100644
--- a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
+++ b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
@@ -25,6 +25,8 @@ class FakeBluetoothDeviceClient;
 class FakeBluetoothInputClient;
 class FakeBluetoothProfileManagerClient;
 class FakeCrosDisksClient;
+class FakePowerManagerClient;
+class FakeUpdateEngineClient;
 class MockIBusClient;
 class MockIBusConfigClient;
 class MockIBusEngineFactoryService;
@@ -144,6 +146,7 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager {
   }
 
  private:
+  // These fake_bluetooth_*_client_ are for ExperimentalBluetooth*Client.
   scoped_ptr<FakeBluetoothAdapterClient> fake_bluetooth_adapter_client_;
   scoped_ptr<FakeBluetoothAgentManagerClient>
       fake_bluetooth_agent_manager_client_;
@@ -152,6 +155,8 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager {
   scoped_ptr<FakeBluetoothProfileManagerClient>
       fake_bluetooth_profile_manager_client_;
   scoped_ptr<FakeCrosDisksClient> fake_cros_disks_client_;
+  scoped_ptr<FakePowerManagerClient> fake_power_manager_client_;
+  scoped_ptr<FakeUpdateEngineClient> fake_update_engine_client_;
 
   scoped_ptr<MockIBusClient> mock_ibus_client_;
   scoped_ptr<MockIBusConfigClient> mock_ibus_config_client_;
@@ -160,6 +165,17 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager {
   scoped_ptr<MockIBusEngineFactoryService> mock_ibus_engine_factory_service_;
   scoped_ptr<MockIBusPanelService> mock_ibus_panel_service_;
 
+  // These stub_bluetooth_*_client_ are for old Bluetooth*Client.
+  // Will be removed once http://crbug.com/221813 is resolved.
+  scoped_ptr<BluetoothManagerClient> stub_bluetooth_manager_client_;
+  scoped_ptr<BluetoothAdapterClient> stub_bluetooth_adapter_client_;
+  scoped_ptr<BluetoothDeviceClient> stub_bluetooth_device_client_;
+
+  scoped_ptr<ImageBurnerClient> stub_image_burner_client_;
+  scoped_ptr<SessionManagerClient> stub_session_manager_client_;
+  scoped_ptr<SystemClockClient> stub_system_clock_client_;
+
+  scoped_ptr<PowerPolicyController> power_policy_controller_;
   dbus::Bus* ibus_bus_;
 
   ObserverList<DBusThreadManagerObserver> observers_;