Refactoring bluetooth API code.

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

 // 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.
 
 #include <string.h>
 
 #include "chrome/browser/chromeos/bluetooth/bluetooth_adapter.h"
 #include "chrome/browser/chromeos/bluetooth/test/mock_bluetooth_adapter.h"
 #include "chrome/browser/chromeos/bluetooth/test/mock_bluetooth_device.h"
 #include "chrome/browser/chromeos/extensions/bluetooth_event_router.h"
 #include "chrome/browser/extensions/api/bluetooth/bluetooth_api.h"
 #include "chrome/browser/extensions/extension_apitest.h"
 #include "chrome/browser/extensions/extension_function_test_utils.h"
 #include "chrome/browser/extensions/extension_service.h"
 #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"
 
 using extensions::Extension;
 
 namespace utils = extension_function_test_utils;
 namespace api = extensions::api;
 
 namespace {
 
@@ skipping 11 matching lines @@
     event_router()->SetAdapterForTest(mock_adapter_);
 
     device1_.reset(new testing::NiceMock<chromeos::MockBluetoothDevice>(
         mock_adapter_, "d1", "11:12:13:14:15:16",
         true /* paired */, false /* bonded */, true /* connected */));
     device2_.reset(new testing::NiceMock<chromeos::MockBluetoothDevice>(
         mock_adapter_, "d2", "21:22:23:24:25:26",
         false /* paired */, true /* bonded */, false /* connected */));
   }
 
+  virtual void CleanUpOnMainThread() OVERRIDE {
+    EXPECT_CALL(*mock_adapter_, RemoveObserver(testing::_));
+  }
+
   void expectBooleanResult(bool expected,
                            UIThreadExtensionFunction* function) {
     scoped_ptr<base::Value> result(
         utils::RunFunctionAndReturnSingleResult(function, "[]", browser()));
     ASSERT_TRUE(result.get() != NULL);
     ASSERT_EQ(base::Value::TYPE_BOOLEAN, result->GetType());
     bool boolean_value;
     result->GetAsBoolean(&boolean_value);
     EXPECT_EQ(expected, boolean_value);
   }
@@ skipping 42 matching lines @@
       chromeos::kBluetoothOutOfBandPairingDataSize);
   return data;
 }
 
 static bool CallClosure(const base::Closure& callback) {
   callback.Run();
   return true;
 }
 
 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());
 }
 
 template <bool Value>
 static void CallProvidesServiceCallback(
       const std::string& name,
       const chromeos::BluetoothDevice::ProvidesServiceCallback& callback) {
   callback.Run(Value);
 }
 
@@ skipping 310 matching lines @@
   GURL page_url =
       extension->GetResourceURL("test_getdevices_concurrently.html");
   ui_test_utils::NavigateToURL(browser(), page_url);
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   callback.Run(false);
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }