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 a1d8b6e0356887d7cf2f6a9b80b2422cc97b657e..78bff872c8ca7a29f6195fae0b3f94532fb1ba4a 100644
--- a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
+++ b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
@@ -25,7 +25,10 @@ class FakeBluetoothDeviceClient;
 class FakeBluetoothInputClient;
 class FakeBluetoothProfileManagerClient;
 class FakeCrosDisksClient;
+class FakePowerManagerClient;
+class FakeSessionManagerClient;
 class FakeShillManagerClient;
+class FakeUpdateEngineClient;
 class MockIBusClient;
 class MockIBusConfigClient;
 class MockIBusEngineFactoryService;
@@ -149,6 +152,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_;
@@ -157,7 +161,10 @@ 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<FakeSessionManagerClient> fake_session_manager_client_;
   scoped_ptr<FakeShillManagerClient> fake_shill_manager_client_;
+  scoped_ptr<FakeUpdateEngineClient> fake_update_engine_client_;
 
   scoped_ptr<MockIBusClient> mock_ibus_client_;
   scoped_ptr<MockIBusConfigClient> mock_ibus_config_client_;
@@ -166,6 +173,13 @@ 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<PowerPolicyController> power_policy_controller_;
   dbus::Bus* ibus_bus_;
 
   ObserverList<DBusThreadManagerObserver> observers_;