chrome.bluetooth API improvements.

chrome/browser/extensions/api/bluetooth/bluetooth_apitest.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 "base/strings/stringprintf.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/api/bluetooth/bluetooth_api.h"
 #include "chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h"
@@ skipping 52 matching lines @@
 
     device1_.reset(new testing::NiceMock<MockBluetoothDevice>(
         mock_adapter_, 0, "d1", "11:12:13:14:15:16",
         true /* paired */, true /* connected */));
     device2_.reset(new testing::NiceMock<MockBluetoothDevice>(
         mock_adapter_, 0, "d2", "21:22:23:24:25:26",
         false /* paired */, false /* connected */));
     device3_.reset(new testing::NiceMock<MockBluetoothDevice>(
         mock_adapter_, 0, "d3", "31:32:33:34:35:36",
         false /* paired */, false /* connected */));
-
   }
 
   void DiscoverySessionCallback(
       const BluetoothAdapter::DiscoverySessionCallback& callback,
       const BluetoothAdapter::ErrorCallback& error_callback) {
     if (mock_session_.get()) {
       callback.Run(
           scoped_ptr<BluetoothDiscoverySession>(mock_session_.release()));
       return;
     }
@@ skipping 10 matching lines @@
  protected:
   testing::StrictMock<MockBluetoothAdapter>* mock_adapter_;
   scoped_ptr<testing::NiceMock<MockBluetoothDiscoverySession> > mock_session_;
   scoped_ptr<testing::NiceMock<MockBluetoothDevice> > device1_;
   scoped_ptr<testing::NiceMock<MockBluetoothDevice> > device2_;
   scoped_ptr<testing::NiceMock<MockBluetoothDevice> > device3_;
   scoped_ptr<testing::NiceMock<MockBluetoothProfile> > profile1_;
   scoped_ptr<testing::NiceMock<MockBluetoothProfile> > profile2_;
 
   extensions::ExtensionBluetoothEventRouter* event_router() {
-    return extensions::BluetoothAPI::Get(browser()->profile())
-        ->bluetooth_event_router();
+    return bluetooth_api()->event_router();
+  }
+
+  extensions::BluetoothAPI* bluetooth_api() {
+    return extensions::BluetoothAPI::Get(browser()->profile());
   }
 
  private:
   scoped_refptr<Extension> empty_extension_;
 };
 
 class TestBluetoothAddProfileFunction
     : public api::BluetoothAddProfileFunction {
  public:
   explicit TestBluetoothAddProfileFunction(BluetoothProfile* profile)
@@ skipping 27 matching lines @@
   memcpy(&(data.randomizer), kOutOfBandPairingDataRandomizer,
       device::kBluetoothOutOfBandPairingDataSize);
   return data;
 }
 
 static bool CallClosure(const base::Closure& callback) {
   callback.Run();
   return true;
 }
 
+static bool CallErrorClosure(const BluetoothDevice::ErrorCallback& callback) {
+  callback.Run();
+  return true;
+}
+
 static void StopDiscoverySessionCallback(const base::Closure& callback,
                                          const base::Closure& error_callback) {
   callback.Run();
 }
 
 static void CallOutOfBandPairingDataCallback(
     const BluetoothAdapter::BluetoothOutOfBandPairingDataCallback& callback,
     const BluetoothAdapter::ErrorCallback& error_callback) {
   callback.Run(GetOutOfBandPairingData());
 }
@@ skipping 144 matching lines @@
       new api::BluetoothSetOutOfBandPairingDataFunction);
   // There isn't actually a result.
   (void) utils::RunFunctionAndReturnSingleResult(
       set_oob_function.get(), params, browser());
 
   // Try again with an error
   testing::Mock::VerifyAndClearExpectations(mock_adapter_);
   testing::Mock::VerifyAndClearExpectations(device1_.get());
   EXPECT_CALL(*mock_adapter_, GetDevice(device1_->GetAddress()))
       .WillOnce(testing::Return(device1_.get()));
-  EXPECT_CALL(*device1_,
-              ClearOutOfBandPairingData(testing::_,
-                                        testing::Truly(CallClosure)));
+  EXPECT_CALL(
+      *device1_,
+      ClearOutOfBandPairingData(testing::_, testing::Truly(CallErrorClosure)));
 
   set_oob_function = setupFunction(
       new api::BluetoothSetOutOfBandPairingDataFunction);
   std::string error(utils::RunFunctionAndReturnError(
       set_oob_function.get(), params, browser()));
   EXPECT_FALSE(error.empty());
 
   // TODO(bryeung): Also test setting the data when there is support for
   // ArrayBuffers in the arguments to the RunFunctionAnd* methods.
   // crbug.com/132796
@@ skipping 221 matching lines @@
   // Load and wait for setup
   ExtensionTestMessageListener listener("ready", true);
   scoped_refptr<const Extension> extension(
       LoadExtension(test_data_dir_.AppendASCII("bluetooth/on_connection")));
   ASSERT_TRUE(extension.get());
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   scoped_refptr<device::MockBluetoothSocket> socket =
       new device::MockBluetoothSocket();
 
+  EXPECT_CALL(*mock_adapter_, GetDevice(device1_->GetAddress()))
+      .WillOnce(testing::Return(device1_.get()));
+
   event_router()->AddProfile("1234", extension->id(), profile1_.get());
-  event_router()->DispatchConnectionEvent(
+  bluetooth_api()->DispatchConnectionEvent(
       extension->id(), "1234", device1_.get(), socket);
+  // Connection events are dispatched using a couple of PostTask to the UI
+  // thread. Waiting until idle ensures the event is dispatched to the
+  // receiver(s).
+  base::RunLoop().RunUntilIdle();
 
   listener.Reply("go");
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
   event_router()->RemoveProfile("1234");
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothApiTest, GetProfiles) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
@@ skipping 80 matching lines @@
   // Load and wait for setup
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(
       LoadExtension(test_data_dir_.AppendASCII("bluetooth/device_info")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }