Revert 255262 "Migrate chrome.bluetooth API backend to use devic..."

trunk/src/device/bluetooth/test/mock_bluetooth_adapter.h

Index: trunk/src/device/bluetooth/test/mock_bluetooth_adapter.h
===================================================================
--- trunk/src/device/bluetooth/test/mock_bluetooth_adapter.h	(revision 255369)
+++ trunk/src/device/bluetooth/test/mock_bluetooth_adapter.h	(working copy)
@@ -52,9 +52,6 @@
                     const base::Closure& callback,
                     const ErrorCallback& error_callback));
   MOCK_CONST_METHOD0(IsDiscovering, bool());
-  MOCK_METHOD2(StartDiscoverySession,
-               void(const DiscoverySessionCallback& callback,
-                    const ErrorCallback& error_callback));
   MOCK_METHOD2(StartDiscovering,
                void(const base::Closure& callback,
                     const ErrorCallback& error_callback));
@@ -77,10 +74,12 @@
   MOCK_METHOD0(DefaultPairingDelegate, BluetoothDevice::PairingDelegate*());
 
  protected:
-  virtual void AddDiscoverySession(const base::Closure& callback,
-                                   const ErrorCallback& error_callback);
-  virtual void RemoveDiscoverySession(const base::Closure& callback,
-                                      const ErrorCallback& error_callback);
+  MOCK_METHOD2(AddDiscoverySession,
+               void(const base::Closure& callback,
+                    const ErrorCallback& error_callback));
+  MOCK_METHOD2(RemoveDiscoverySession,
+               void(const base::Closure& callback,
+                    const ErrorCallback& error_callback));
   virtual ~MockBluetoothAdapter();
 
   MOCK_METHOD1(RemovePairingDelegateInternal,