Revert 197865 "dbus: Use fakes for some clients and utils for Mo..."

trunk/src/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc

Index: trunk/src/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc
===================================================================
--- trunk/src/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc	(revision 197867)
+++ trunk/src/chromeos/dbus/mock_dbus_thread_manager_without_gmock.cc	(working copy)
@@ -4,9 +4,6 @@
 
 #include "chromeos/dbus/mock_dbus_thread_manager_without_gmock.h"
 
-#include "chromeos/dbus/bluetooth_adapter_client.h"
-#include "chromeos/dbus/bluetooth_device_client.h"
-#include "chromeos/dbus/bluetooth_manager_client.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"
@@ -19,18 +16,14 @@
 #include "chromeos/dbus/fake_old_bluetooth_adapter_client.h"
 #include "chromeos/dbus/fake_old_bluetooth_device_client.h"
 #include "chromeos/dbus/fake_old_bluetooth_manager_client.h"
-#include "chromeos/dbus/fake_power_manager_client.h"
-#include "chromeos/dbus/fake_session_manager_client.h"
 #include "chromeos/dbus/fake_shill_manager_client.h"
 #include "chromeos/dbus/fake_system_clock_client.h"
-#include "chromeos/dbus/fake_update_engine_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 "chromeos/dbus/power_policy_controller.h"
 
 namespace chromeos {
 
@@ -44,11 +37,8 @@
     fake_cros_disks_client_(new FakeCrosDisksClient),
     fake_cryptohome_client_(new FakeCryptohomeClient),
     fake_image_burner_client_(new FakeImageBurnerClient),
-    fake_session_manager_client_(new FakeSessionManagerClient),
     fake_shill_manager_client_(new FakeShillManagerClient),
     fake_system_clock_client_(new FakeSystemClockClient),
-    fake_power_manager_client_(new FakePowerManagerClient),
-    fake_update_engine_client_(new FakeUpdateEngineClient),
     fake_old_bluetooth_manager_client_(new FakeOldBluetoothManagerClient),
     fake_old_bluetooth_adapter_client_(new FakeOldBluetoothAdapterClient),
     fake_old_bluetooth_device_client_(new FakeOldBluetoothDeviceClient),
@@ -59,8 +49,6 @@
     mock_ibus_engine_factory_service_(new MockIBusEngineFactoryService),
     mock_ibus_panel_service_(new MockIBusPanelService),
     ibus_bus_(NULL) {
-  power_policy_controller_.reset(
-      new PowerPolicyController(this, fake_power_manager_client_.get()));
 }
 
 MockDBusThreadManagerWithoutGMock::~MockDBusThreadManagerWithoutGMock() {
@@ -224,17 +212,20 @@
 }
 
 PowerManagerClient* MockDBusThreadManagerWithoutGMock::GetPowerManagerClient() {
-  return fake_power_manager_client_.get();
+  NOTIMPLEMENTED();
+  return NULL;
 }
 
 PowerPolicyController*
 MockDBusThreadManagerWithoutGMock::GetPowerPolicyController() {
-  return power_policy_controller_.get();
+  NOTIMPLEMENTED();
+  return NULL;
 }
 
 SessionManagerClient*
     MockDBusThreadManagerWithoutGMock::GetSessionManagerClient() {
-  return fake_session_manager_client_.get();
+  NOTIMPLEMENTED();
+  return NULL;
 }
 
 SMSClient* MockDBusThreadManagerWithoutGMock::GetSMSClient() {
@@ -247,7 +238,8 @@
 }
 
 UpdateEngineClient* MockDBusThreadManagerWithoutGMock::GetUpdateEngineClient() {
-  return fake_update_engine_client_.get();
+  NOTIMPLEMENTED();
+  return NULL;
 }
 
 BluetoothOutOfBandClient*