Refactoring bluetooth API code.

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

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_CHROMEOS_BLUETOOTH_TEST_MOCK_BLUETOOTH_ADAPTER_H_
 #define CHROME_BROWSER_CHROMEOS_BLUETOOTH_TEST_MOCK_BLUETOOTH_ADAPTER_H_
 
 #include <string>
 
 #include "base/callback.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"
 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
 #include "chromeos/dbus/bluetooth_out_of_band_client.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
 namespace chromeos {
 
 class MockBluetoothAdapter : public BluetoothAdapter {
  public:
   class Observer : public BluetoothAdapter::Observer {
    public:
     Observer();
     virtual ~Observer();
 
     MOCK_METHOD2(AdapterPresentChanged, void(BluetoothAdapter*, bool));
     MOCK_METHOD2(AdapterPoweredChanged, void(BluetoothAdapter*, bool));
-    MOCK_METHOD2(AdapterDiscoveringChanged, void(BluetoothAdapter *, bool));
-    MOCK_METHOD2(DeviceAdded, void(BluetoothAdapter *, BluetoothDevice *));
-    MOCK_METHOD2(DeviceChanged, void(BluetoothAdapter *, BluetoothDevice *));
-    MOCK_METHOD2(DeviceRemoved, void(BluetoothAdapter *, BluetoothDevice *));
+    MOCK_METHOD2(AdapterDiscoveringChanged,

[bryeung, 2012/09/13 19:52:57]

why did this get line-broken?

[youngki, 2012/09/17 21:53:02]

Done.

+                 void(BluetoothAdapter*, bool));
+    MOCK_METHOD2(DeviceAdded,
+                 void(BluetoothAdapter*, BluetoothDevice*));
+    MOCK_METHOD2(DeviceChanged,
+                 void(BluetoothAdapter*, BluetoothDevice*));
+    MOCK_METHOD2(DeviceRemoved,
+                 void(BluetoothAdapter*, BluetoothDevice*));
   };
 
   MockBluetoothAdapter(const std::string& address, const std::string& name);
 
+  MOCK_METHOD1(AddObserver, void(BluetoothAdapter::Observer*));
+  MOCK_METHOD1(RemoveObserver, void(BluetoothAdapter::Observer*));
+  MOCK_CONST_METHOD0(address, const std::string&());
+  MOCK_CONST_METHOD0(name, const std::string&());
   MOCK_CONST_METHOD0(IsPresent, bool());
   MOCK_CONST_METHOD0(IsPowered, bool());
+  MOCK_METHOD3(SetPowered,
+               void(bool discovering,
+                    const base::Closure& callback,
+                    const ErrorCallback& error_callback));
   MOCK_CONST_METHOD0(IsDiscovering, bool());
   MOCK_METHOD3(SetDiscovering,
                void(bool discovering,
                     const base::Closure& callback,
-                    const BluetoothAdapter::ErrorCallback& error_callback));
-  MOCK_CONST_METHOD0(GetDevices, ConstDeviceList());
+                    const ErrorCallback& error_callback));
+  MOCK_METHOD0(GetDevices, BluetoothAdapter::DeviceList());
+  MOCK_CONST_METHOD0(GetDevices, BluetoothAdapter::ConstDeviceList());
   MOCK_METHOD1(GetDevice, BluetoothDevice*(const std::string& address));
   MOCK_CONST_METHOD1(GetDevice,
                      const BluetoothDevice*(const std::string& address));
   MOCK_METHOD2(
       ReadLocalOutOfBandPairingData,
-      void(const BluetoothAdapter::BluetoothOutOfBandPairingDataCallback&
-               callback,
-           const BluetoothAdapter::ErrorCallback& error_callback));
+      void(const BluetoothOutOfBandPairingDataCallback& callback,
+           const ErrorCallback& error_callback));
  protected:
   virtual ~MockBluetoothAdapter();
 };
 
 }  // namespace chromeos
 
 #endif  // CHROME_BROWSER_CHROMEOS_BLUETOOTH_TEST_MOCK_BLUETOOTH_ADAPTER_H_