dbus: Use fakes 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 cb85610475c62a2985b9c3813fee7834f82a2d1d..0eb41dad2e0a6c949cc0e8b8fd9a3488e9794f3c 100644
--- a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
+++ b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
@@ -29,9 +29,12 @@ class FakeCryptohomeClient;
 class FakeOldBluetoothAdapterClient;
 class FakeOldBluetoothDeviceClient;
 class FakeOldBluetoothManagerClient;
-class FakeShillManagerClient;
+class FakePowerManagerClient;
 class FakeImageBurnerClient;
+class FakeSessionManagerClient;
+class FakeShillManagerClient;
 class FakeSystemClockClient;
+class FakeUpdateEngineClient;
 class MockIBusClient;
 class MockIBusConfigClient;
 class MockIBusEngineFactoryService;
@@ -167,6 +170,10 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager {
   }
 
  private:
+  // Note: Keep this before other members so they can call AddObserver() in
+  // their c'tors.
+  ObserverList<DBusThreadManagerObserver> observers_;
+
   // These fake_bluetooth_*_client_ are for ExperimentalBluetooth*Client.
   scoped_ptr<FakeBluetoothAdapterClient> fake_bluetooth_adapter_client_;
   scoped_ptr<FakeBluetoothAgentManagerClient>
@@ -178,8 +185,11 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager {
   scoped_ptr<FakeCrosDisksClient> fake_cros_disks_client_;
   scoped_ptr<FakeCryptohomeClient> fake_cryptohome_client_;
   scoped_ptr<FakeImageBurnerClient> fake_image_burner_client_;
+  scoped_ptr<FakeSessionManagerClient> fake_session_manager_client_;
   scoped_ptr<FakeShillManagerClient> fake_shill_manager_client_;
   scoped_ptr<FakeSystemClockClient> fake_system_clock_client_;
+  scoped_ptr<FakePowerManagerClient> fake_power_manager_client_;
+  scoped_ptr<FakeUpdateEngineClient> fake_update_engine_client_;
 
   // These fake_old_bluetooth_*_client_ are for old Bluetooth*Client.
   // Will be removed once http://crbug.com/221813 is resolved.
@@ -194,10 +204,9 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager {
   scoped_ptr<MockIBusEngineFactoryService> mock_ibus_engine_factory_service_;
   scoped_ptr<MockIBusPanelService> mock_ibus_panel_service_;
 
+  scoped_ptr<PowerPolicyController> power_policy_controller_;
   dbus::Bus* ibus_bus_;
 
-  ObserverList<DBusThreadManagerObserver> observers_;
-
   DISALLOW_COPY_AND_ASSIGN(MockDBusThreadManagerWithoutGMock);
 };