Refactoring bluetooth API code.

chrome/browser/extensions/api/bluetooth/bluetooth_apitest_chromeos.cc

Index: chrome/browser/extensions/api/bluetooth/bluetooth_apitest_chromeos.cc
diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_apitest_chromeos.cc b/chrome/browser/extensions/api/bluetooth/bluetooth_apitest_chromeos.cc
index b9c095184210b897054ccddb4c076e7d0d84824b..f79229a89022253adb473770fffbd158e87ded5b 100644
--- a/chrome/browser/extensions/api/bluetooth/bluetooth_apitest_chromeos.cc
+++ b/chrome/browser/extensions/api/bluetooth/bluetooth_apitest_chromeos.cc
@@ -15,6 +15,7 @@
 #include "chrome/browser/extensions/extension_test_message_listener.h"
 #include "chrome/browser/ui/browser.h"
 #include "chromeos/dbus/bluetooth_out_of_band_client.h"
+#include "chromeos/dbus/bluetooth_out_of_band_pairing_data.h"
 #include "chrome/test/base/ui_test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 
@@ -108,9 +109,9 @@ static bool CallClosure(const base::Closure& callback) {
 }
 
 static void CallOutOfBandPairingDataCallback(
-      const chromeos::BluetoothAdapter::BluetoothOutOfBandPairingDataCallback&
-          callback,
-      const chromeos::BluetoothAdapter::ErrorCallback& error_callback) {
+    const chromeos::BluetoothAdapter::BluetoothOutOfBandPairingDataCallback&
+        callback,
+    const chromeos::BluetoothAdapter::ErrorCallback& error_callback) {
   callback.Run(GetOutOfBandPairingData());
 }
 
@@ -394,7 +395,7 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, GetDevices) {
   EXPECT_CALL(*device2_, ProvidesServiceWithName(testing::_, testing::_))
       .WillOnce(testing::Invoke(CallProvidesServiceCallback<false>));
 
-  EXPECT_CALL(*mock_adapter_, GetDevices())
+  EXPECT_CALL(testing::Const(*mock_adapter_), GetDevices())
       .Times(3)
       .WillRepeatedly(testing::Return(devices));
 
@@ -424,7 +425,7 @@ IN_PROC_BROWSER_TEST_F(BluetoothApiTest, GetDevicesConcurrently) {
   EXPECT_CALL(*device1_, ProvidesServiceWithName(testing::_, testing::_))
       .WillOnce(testing::SaveArg<1>(&callback));
 
-  EXPECT_CALL(*mock_adapter_, GetDevices())
+  EXPECT_CALL(testing::Const(*mock_adapter_), GetDevices())
       .WillOnce(testing::Return(devices));
 
   // Load and wait for setup