Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1468)

Unified Diff: device/bluetooth/test/mock_bluetooth_device.cc

Issue 12929003: Implemented BluetoothAdapterMac::AddDevices(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: DeviceRemoved obsolete in OSX. Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: device/bluetooth/test/mock_bluetooth_device.cc
diff --git a/device/bluetooth/test/mock_bluetooth_device.cc b/device/bluetooth/test/mock_bluetooth_device.cc
index f2f358db5abebc6a1297e1098ed3d994c71d8c80..5e8b4d92e214da096cc3b75b9e9066bb36157b2c 100644
--- a/device/bluetooth/test/mock_bluetooth_device.cc
+++ b/device/bluetooth/test/mock_bluetooth_device.cc
@@ -2,9 +2,11 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
+#include "device/bluetooth/test/mock_bluetooth_device.h"
+
#include "base/utf_string_conversions.h"
+#include "device/bluetooth/bluetooth_device.h"
#include "device/bluetooth/test/mock_bluetooth_adapter.h"
-#include "device/bluetooth/test/mock_bluetooth_device.h"
namespace device {
@@ -14,7 +16,8 @@ MockBluetoothDevice::MockBluetoothDevice(MockBluetoothAdapter* adapter,
bool paired,
bool bonded,
bool connected)
- : name_(UTF8ToUTF16(name)),
+ : BluetoothDevice(name, address, 0, connected, bonded),
+ name_(UTF8ToUTF16(name)),
address_(address) {
ON_CALL(*this, GetName())
.WillByDefault(testing::Return(name_));

Powered by Google App Engine
This is Rietveld 408576698