| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_ADAPTER_H_ | 5 #ifndef DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_ADAPTER_H_ |
| 6 #define DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_ADAPTER_H_ | 6 #define DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_ADAPTER_H_ |
| 7 | 7 |
| 8 #include <memory> | 8 #include <memory> |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 140 const base::TimeDelta& min, | 140 const base::TimeDelta& min, |
| 141 const base::TimeDelta& max, | 141 const base::TimeDelta& max, |
| 142 const base::Closure& callback, | 142 const base::Closure& callback, |
| 143 const AdvertisementErrorCallback& error_callback) override; | 143 const AdvertisementErrorCallback& error_callback) override; |
| 144 #endif | 144 #endif |
| 145 virtual ~MockBluetoothAdapter(); | 145 virtual ~MockBluetoothAdapter(); |
| 146 | 146 |
| 147 MOCK_METHOD1(RemovePairingDelegateInternal, | 147 MOCK_METHOD1(RemovePairingDelegateInternal, |
| 148 void(BluetoothDevice::PairingDelegate* pairing_delegate)); | 148 void(BluetoothDevice::PairingDelegate* pairing_delegate)); |
| 149 | 149 |
| 150 ScopedVector<MockBluetoothDevice> mock_devices_; | 150 std::vector<std::unique_ptr<MockBluetoothDevice>> mock_devices_; |
| 151 }; | 151 }; |
| 152 | 152 |
| 153 } // namespace device | 153 } // namespace device |
| 154 | 154 |
| 155 #endif // DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_ADAPTER_H_ | 155 #endif // DEVICE_BLUETOOTH_TEST_MOCK_BLUETOOTH_ADAPTER_H_ |
| OLD | NEW |