Refactoring bluetooth API code.

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

Index: chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.h
diff --git a/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.h b/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.h
index 7079f28e57ec7b566e3d0de363b3511d1b769d78..899049f4182ddacc8501c0a7d7d8060e4f663035 100644
--- a/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.h
+++ b/chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.h
@@ -9,6 +9,7 @@
 
 #include "base/string16.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
+#include "chromeos/dbus/bluetooth_out_of_band_pairing_data.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
@@ -25,14 +26,21 @@ class MockBluetoothDevice : public BluetoothDevice {
 
   MOCK_CONST_METHOD0(address, const std::string&());
   MOCK_CONST_METHOD0(GetName, string16());
+  MOCK_CONST_METHOD0(GetDeviceType, BluetoothDevice::DeviceType());
   MOCK_CONST_METHOD0(IsPaired, bool());
   MOCK_CONST_METHOD0(IsBonded, bool());
   MOCK_CONST_METHOD0(IsConnected, bool());
+  MOCK_METHOD2(GetServiceRecords,
+               void(const BluetoothDevice::ServiceRecordsCallback&,
+                    const BluetoothDevice::ErrorCallback&));
   MOCK_CONST_METHOD1(ProvidesServiceWithUUID, bool(const std::string&));
-
   MOCK_METHOD2(ProvidesServiceWithName,
-      void(const std::string&,
-           const ProvidesServiceCallback& callback));
+               void(const std::string&,
+                    const BluetoothDevice::ProvidesServiceCallback&));
+  MOCK_METHOD2(ConnectToService,
+               void(const std::string&,
+                    const BluetoothDevice::SocketCallback&));
+
   MOCK_METHOD3(SetOutOfBandPairingData,
       void(const chromeos::BluetoothOutOfBandPairingData& data,
            const base::Closure& callback,