| Index: device/bluetooth/test/mock_bluetooth_adapter.h
|
| diff --git a/device/bluetooth/test/mock_bluetooth_adapter.h b/device/bluetooth/test/mock_bluetooth_adapter.h
|
| index 56647fe0ba1aee28f8be54f9c1f2610d33d09093..3a959e94ef8b31f889f0bd51b090ce70a8fd7faa 100644
|
| --- a/device/bluetooth/test/mock_bluetooth_adapter.h
|
| +++ b/device/bluetooth/test/mock_bluetooth_adapter.h
|
| @@ -52,6 +52,9 @@ class MockBluetoothAdapter : public BluetoothAdapter {
|
| const base::Closure& callback,
|
| const ErrorCallback& error_callback));
|
| MOCK_CONST_METHOD0(IsDiscovering, bool());
|
| + MOCK_METHOD2(StartDiscoverySession,
|
| + void(const DiscoverySessionCallback& callback,
|
| + const ErrorCallback& error_callback));
|
| MOCK_METHOD2(StartDiscovering,
|
| void(const base::Closure& callback,
|
| const ErrorCallback& error_callback));
|
| @@ -74,12 +77,10 @@ class MockBluetoothAdapter : public BluetoothAdapter {
|
| MOCK_METHOD0(DefaultPairingDelegate, BluetoothDevice::PairingDelegate*());
|
|
|
| protected:
|
| - MOCK_METHOD2(AddDiscoverySession,
|
| - void(const base::Closure& callback,
|
| - const ErrorCallback& error_callback));
|
| - MOCK_METHOD2(RemoveDiscoverySession,
|
| - void(const base::Closure& callback,
|
| - const ErrorCallback& error_callback));
|
| + virtual void AddDiscoverySession(const base::Closure& callback,
|
| + const ErrorCallback& error_callback);
|
| + virtual void RemoveDiscoverySession(const base::Closure& callback,
|
| + const ErrorCallback& error_callback);
|
| virtual ~MockBluetoothAdapter();
|
|
|
| MOCK_METHOD1(RemovePairingDelegateInternal,
|
|
|