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

Unified Diff: chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.cc

Issue 10899037: Refactoring bluetooth API code. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Removed ASSERT_TRUE checks. Created 8 years, 3 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: chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.cc
diff --git a/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.cc b/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.cc
index 5bc0cf7a428e6affa7afb624a6572eb274ce2190..1387fd2725a42faace0f7c61d84eb7d426dc4c3c 100644
--- a/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.cc
+++ b/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.cc
@@ -14,8 +14,7 @@ MockBluetoothDevice::MockBluetoothDevice(MockBluetoothAdapter* adapter,
bool paired,
bool bonded,
bool connected)
- : BluetoothDevice(adapter),
- name_(UTF8ToUTF16(name)),
+ : name_(UTF8ToUTF16(name)),
address_(address) {
ON_CALL(*this, GetName())
.WillByDefault(testing::Return(name_));
@@ -27,6 +26,14 @@ MockBluetoothDevice::MockBluetoothDevice(MockBluetoothAdapter* adapter,
.WillByDefault(testing::Return(bonded));
ON_CALL(*this, IsConnected())
.WillByDefault(testing::Return(connected));
+ ON_CALL(*this, ExpectingPinCode())
+ .WillByDefault(testing::Return(false));
+ ON_CALL(*this, ExpectingPasskey())
+ .WillByDefault(testing::Return(false));
+ ON_CALL(*this, ExpectingConfirmation())
+ .WillByDefault(testing::Return(false));
+ ON_CALL(*this, GetServices())
+ .WillByDefault(testing::ReturnRef(service_list_));
}
MockBluetoothDevice::~MockBluetoothDevice() {}

Powered by Google App Engine
This is Rietveld 408576698