Refactoring bluetooth API code.

chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.cc

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..6335f5d3a20d7644824ac210611b86ef89da46e3 100644
--- a/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.cc
+++ b/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.cc
@@ -13,20 +13,21 @@ MockBluetoothDevice::MockBluetoothDevice(MockBluetoothAdapter* adapter,
                                          const std::string& address,
                                          bool paired,
                                          bool bonded,
-                                         bool connected)
-    : BluetoothDevice(adapter),
-      name_(UTF8ToUTF16(name)),
-      address_(address) {
+                                         bool connected) {
   ON_CALL(*this, GetName())
-      .WillByDefault(testing::Return(name_));
+      .WillByDefault(testing::Return(UTF8ToUTF16(name)));
   ON_CALL(*this, address())
-      .WillByDefault(testing::ReturnRef(address_));
+      .WillByDefault(testing::ReturnRef(address));
   ON_CALL(*this, IsPaired())
       .WillByDefault(testing::Return(paired));
   ON_CALL(*this, IsBonded())
       .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));
 }
 
 MockBluetoothDevice::~MockBluetoothDevice() {}