Index: chromeos/dbus/mock_dbus_thread_manager.h |
diff --git a/chromeos/dbus/mock_dbus_thread_manager.h b/chromeos/dbus/mock_dbus_thread_manager.h |
index 6102cbd0659edddda7b8ec11bb360d92840c2a98..55d853bd2d7b77f3e4e055ba1063547d16dc90a3 100644 |
--- a/chromeos/dbus/mock_dbus_thread_manager.h |
+++ b/chromeos/dbus/mock_dbus_thread_manager.h |
@@ -44,6 +44,7 @@ class MockSessionManagerClient; |
class MockSMSClient; |
class MockSpeechSynthesizerClient; |
class MockUpdateEngineClient; |
+class PowerPolicyController; |
// This class provides a mock DBusThreadManager with mock clients |
// installed. You can customize the behaviors of mock clients with |
@@ -78,6 +79,7 @@ class MockDBusThreadManager : public DBusThreadManager { |
MOCK_METHOD0(GetModemMessagingClient, ModemMessagingClient*(void)); |
MOCK_METHOD0(GetPermissionBrokerClient, PermissionBrokerClient*(void)); |
MOCK_METHOD0(GetPowerManagerClient, PowerManagerClient*(void)); |
+ MOCK_METHOD0(GetPowerPolicyController, PowerPolicyController*(void)); |
MOCK_METHOD0(GetSessionManagerClient, SessionManagerClient*(void)); |
MOCK_METHOD0(GetSMSClient, SMSClient*(void)); |
MOCK_METHOD0(GetSpeechSynthesizerClient, SpeechSynthesizerClient*(void)); |
@@ -166,6 +168,10 @@ class MockDBusThreadManager : public DBusThreadManager { |
} |
private: |
+ // Note: Keep this before other members so they can call AddObserver() in |
+ // their c'tors. |
+ ObserverList<DBusThreadManagerObserver> observers_; |
+ |
scoped_ptr<MockBluetoothAdapterClient> mock_bluetooth_adapter_client_; |
scoped_ptr<MockBluetoothDeviceClient> mock_bluetooth_device_client_; |
scoped_ptr<MockBluetoothInputClient> mock_bluetooth_input_client_; |
@@ -190,8 +196,7 @@ class MockDBusThreadManager : public DBusThreadManager { |
scoped_ptr<MockSMSClient> mock_sms_client_; |
scoped_ptr<MockSpeechSynthesizerClient> mock_speech_synthesizer_client_; |
scoped_ptr<MockUpdateEngineClient> mock_update_engine_client_; |
- |
- ObserverList<DBusThreadManagerObserver> observers_; |
+ scoped_ptr<PowerPolicyController> power_policy_controller_; |
DISALLOW_COPY_AND_ASSIGN(MockDBusThreadManager); |
}; |