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

trunk/src/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h

 // 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.
 
 #ifndef CHROMEOS_DBUS_MOCK_DBUS_THREAD_MANAGER_WITHOUT_GMOCK_H_
 #define CHROMEOS_DBUS_MOCK_DBUS_THREAD_MANAGER_WITHOUT_GMOCK_H_
 
 #include <string>
 
 #include "base/logging.h"
@@ skipping 11 matching lines @@
 class FakeBluetoothAdapterClient;
 class FakeBluetoothAgentManagerClient;
 class FakeBluetoothDeviceClient;
 class FakeBluetoothInputClient;
 class FakeBluetoothProfileManagerClient;
 class FakeCrosDisksClient;
 class FakeCryptohomeClient;
 class FakeOldBluetoothAdapterClient;
 class FakeOldBluetoothDeviceClient;
 class FakeOldBluetoothManagerClient;
-class FakePowerManagerClient;
+class FakeShillManagerClient;
 class FakeImageBurnerClient;
-class FakeSessionManagerClient;
-class FakeShillManagerClient;
 class FakeSystemClockClient;
-class FakeUpdateEngineClient;
 class MockIBusClient;
 class MockIBusConfigClient;
 class MockIBusEngineFactoryService;
 class MockIBusEngineService;
 class MockIBusInputContextClient;
 class MockIBusPanelService;
 
 // This class provides an another mock DBusThreadManager without gmock
 // dependency. This class is used for places where GMock is not allowed
 // (ex. ui/) or is not used.
@@ skipping 126 matching lines @@
   scoped_ptr<FakeBluetoothAdapterClient> fake_bluetooth_adapter_client_;
   scoped_ptr<FakeBluetoothAgentManagerClient>
       fake_bluetooth_agent_manager_client_;
   scoped_ptr<FakeBluetoothDeviceClient> fake_bluetooth_device_client_;
   scoped_ptr<FakeBluetoothInputClient> fake_bluetooth_input_client_;
   scoped_ptr<FakeBluetoothProfileManagerClient>
       fake_bluetooth_profile_manager_client_;
   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.
   scoped_ptr<FakeOldBluetoothManagerClient> fake_old_bluetooth_manager_client_;
   scoped_ptr<FakeOldBluetoothAdapterClient> fake_old_bluetooth_adapter_client_;
   scoped_ptr<FakeOldBluetoothDeviceClient> fake_old_bluetooth_device_client_;
 
   scoped_ptr<MockIBusClient> mock_ibus_client_;
   scoped_ptr<MockIBusConfigClient> mock_ibus_config_client_;
   scoped_ptr<MockIBusInputContextClient> mock_ibus_input_context_client_;
   scoped_ptr<MockIBusEngineService> mock_ibus_engine_service_;
   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);
 };
 
 }  // namespace chromeos
 
 #endif  // CHROMEOS_DBUS_MOCK_DBUS_THREAD_MANAGER_WITHOUT_GMOCK_H_