| 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 ff1e7365cd6d879af34199d4da01bba4ea62cfda..cb85610475c62a2985b9c3813fee7834f82a2d1d 100644
|
| --- a/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
|
| +++ b/chromeos/dbus/mock_dbus_thread_manager_without_gmock.h
|
| @@ -26,6 +26,9 @@ class FakeBluetoothInputClient;
|
| class FakeBluetoothProfileManagerClient;
|
| class FakeCrosDisksClient;
|
| class FakeCryptohomeClient;
|
| +class FakeOldBluetoothAdapterClient;
|
| +class FakeOldBluetoothDeviceClient;
|
| +class FakeOldBluetoothManagerClient;
|
| class FakeShillManagerClient;
|
| class FakeImageBurnerClient;
|
| class FakeSystemClockClient;
|
| @@ -164,6 +167,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_;
|
| @@ -177,6 +181,12 @@ class MockDBusThreadManagerWithoutGMock : public DBusThreadManager {
|
| scoped_ptr<FakeShillManagerClient> fake_shill_manager_client_;
|
| scoped_ptr<FakeSystemClockClient> fake_system_clock_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_;
|
|
|