| Index: chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device_dbus.h
|
| diff --git a/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.h b/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device_dbus.h
|
| similarity index 60%
|
| rename from chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.h
|
| rename to chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device_dbus.h
|
| index b2b7b881abf2fb5fda1d639613b78aede780b982..9f11976a716ff5c79ec1cdbd5119e96c5934fd08 100644
|
| --- a/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.h
|
| +++ b/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device_dbus.h
|
| @@ -2,26 +2,27 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_CHROMEOS_BLUETOOTH_TEST_MOCK_BLUETOOTH_DEVICE_H_
|
| -#define CHROME_BROWSER_CHROMEOS_BLUETOOTH_TEST_MOCK_BLUETOOTH_DEVICE_H_
|
| +#ifndef CHROME_BROWSER_CHROMEOS_BLUETOOTH_TEST_MOCK_BLUETOOTH_DEVICE_DBUS_H_
|
| +#define CHROME_BROWSER_CHROMEOS_BLUETOOTH_TEST_MOCK_BLUETOOTH_DEVICE_DBUS_H_
|
|
|
| #include <string>
|
|
|
| #include "base/string16.h"
|
| -#include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
|
| +#include "chrome/browser/chromeos/bluetooth/bluetooth_device_dbus.h"
|
| +#include "chromeos/dbus/bluetooth_out_of_band_pairing_data.h"
|
| #include "testing/gmock/include/gmock/gmock.h"
|
|
|
| namespace chromeos {
|
|
|
| -class MockBluetoothDevice : public BluetoothDevice {
|
| +class MockBluetoothDeviceDBus : public BluetoothDeviceDBus {
|
| public:
|
| - MockBluetoothDevice(MockBluetoothAdapter* adapter,
|
| - const std::string& name,
|
| - const std::string& address,
|
| - bool paired,
|
| - bool bonded,
|
| - bool connected);
|
| - virtual ~MockBluetoothDevice();
|
| + MockBluetoothDeviceDBus(MockBluetoothAdapterDBus* adapter,
|
| + const std::string& name,
|
| + const std::string& address,
|
| + bool paired,
|
| + bool bonded,
|
| + bool connected);
|
| + virtual ~MockBluetoothDeviceDBus();
|
|
|
| MOCK_CONST_METHOD0(address, const std::string&());
|
| MOCK_CONST_METHOD0(GetName, string16());
|
| @@ -33,10 +34,10 @@ class MockBluetoothDevice : public BluetoothDevice {
|
| MOCK_METHOD3(SetOutOfBandPairingData,
|
| void(const chromeos::BluetoothOutOfBandPairingData& data,
|
| const base::Closure& callback,
|
| - const BluetoothDevice::ErrorCallback& error_callback));
|
| + const BluetoothDeviceDBus::ErrorCallback& error_callback));
|
| MOCK_METHOD2(ClearOutOfBandPairingData,
|
| void(const base::Closure& callback,
|
| - const BluetoothDevice::ErrorCallback& error_callback));
|
| + const BluetoothDeviceDBus::ErrorCallback& error_callback));
|
|
|
| private:
|
| string16 name_;
|
| @@ -45,4 +46,4 @@ class MockBluetoothDevice : public BluetoothDevice {
|
|
|
| } // namespace chromeos
|
|
|
| -#endif // CHROME_BROWSER_CHROMEOS_BLUETOOTH_TEST_MOCK_BLUETOOTH_DEVICE_H_
|
| +#endif // CHROME_BROWSER_CHROMEOS_BLUETOOTH_TEST_MOCK_BLUETOOTH_DEVICE_DBUS_H_
|
|
|