Bluetooth: add Device events, and cleanup JS API

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"
 #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 "chrome/test/base/ui_test_utils.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_out_of_band_pairing_data.h"
@@ skipping 41 matching lines @@
     // The browser will clean this up when it is torn down
     mock_adapter_ = new testing::StrictMock<MockBluetoothAdapter>();
     event_router()->SetAdapterForTest(mock_adapter_);
 
     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;
     }
     error_callback.Run();
   }
 
   template <class T>
   T* setupFunction(T* function) {
     function->set_extension(empty_extension_.get());
     function->set_has_callback(true);
     return function;
   }
 
  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();
   }
 
  private:
   scoped_refptr<Extension> empty_extension_;
@@ skipping 212 matching lines @@
       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
 }
 
+IN_PROC_BROWSER_TEST_F(BluetoothApiTest, DeviceEvents) {
+  ResultCatcher catcher;
+  catcher.RestrictToProfile(browser()->profile());
+
+  ASSERT_TRUE(LoadExtension(
+        test_data_dir_.AppendASCII("bluetooth/device_events")));
+
+  ExtensionTestMessageListener events_received("ready", true);
+  event_router()->DeviceAdded(mock_adapter_, device1_.get());
+  event_router()->DeviceAdded(mock_adapter_, device2_.get());
+
+  EXPECT_CALL(*device2_.get(), GetDeviceName())
+    .WillRepeatedly(testing::Return("the real d2"));
+  EXPECT_CALL(*device2_.get(), GetName())
+    .WillRepeatedly(testing::Return(base::UTF8ToUTF16("the real d2")));
+  event_router()->DeviceChanged(mock_adapter_, device2_.get());
+
+  event_router()->DeviceAdded(mock_adapter_, device3_.get());
+  event_router()->DeviceRemoved(mock_adapter_, device1_.get());
+  EXPECT_TRUE(events_received.WaitUntilSatisfied());
+  events_received.Reply("go");
+
+  EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
+}
+
 IN_PROC_BROWSER_TEST_F(BluetoothApiTest, Discovery) {
   // Try with a failure to start. This will return an error as we haven't
   // initialied a session object.
   EXPECT_CALL(*mock_adapter_, StartDiscoverySession(testing::_, testing::_))
       .WillOnce(
           testing::Invoke(this, &BluetoothApiTest::DiscoverySessionCallback));
 
-  // StartDiscovery failure will remove the adapter that is no longer used.
-  EXPECT_CALL(*mock_adapter_, RemoveObserver(testing::_));
+  // StartDiscovery failure will not reference the adapter.
   scoped_refptr<api::BluetoothStartDiscoveryFunction> start_function;
   start_function = setupFunction(new api::BluetoothStartDiscoveryFunction);
   std::string error(
       utils::RunFunctionAndReturnError(start_function.get(), "[]", browser()));
   ASSERT_FALSE(error.empty());
 
   // Reset the adapter and initiate a discovery session. The ownership of the
   // mock session will be passed to the event router.
   ASSERT_FALSE(mock_session_.get());
   SetUpMockAdapter();
 
   // Create a mock session to be returned as a result. Get a handle to it as
   // its ownership will be passed and |mock_session_| will be reset.
   mock_session_.reset(new testing::NiceMock<MockBluetoothDiscoverySession>(
       scoped_refptr<BluetoothAdapter>(mock_adapter_)));
   MockBluetoothDiscoverySession* session = mock_session_.get();
   EXPECT_CALL(*mock_adapter_, StartDiscoverySession(testing::_, testing::_))
       .WillOnce(
           testing::Invoke(this, &BluetoothApiTest::DiscoverySessionCallback));
   start_function = setupFunction(new api::BluetoothStartDiscoveryFunction);
   (void)
       utils::RunFunctionAndReturnError(start_function.get(), "[]", browser());
 
   // End the discovery session. The StopDiscovery function should succeed.
   testing::Mock::VerifyAndClearExpectations(mock_adapter_);
   EXPECT_CALL(*session, IsActive()).WillOnce(testing::Return(true));
   EXPECT_CALL(*session, Stop(testing::_, testing::_))
       .WillOnce(testing::Invoke(StopDiscoverySessionCallback));
 
-  // StopDiscovery success will remove the adapter that is no longer used.
-  EXPECT_CALL(*mock_adapter_, RemoveObserver(testing::_));
+  // StopDiscovery success will remove the session object, unreferncing the

[armansito, 2014/03/05 21:44:15]

s/unreferncing/unreferencing/

[keybuk, 2014/03/06 21:33:44]

Done.

+  // adapter.
   scoped_refptr<api::BluetoothStopDiscoveryFunction> stop_function;
   stop_function = setupFunction(new api::BluetoothStopDiscoveryFunction);
   (void) utils::RunFunctionAndReturnSingleResult(
       stop_function.get(), "[]", browser());
 
   // Reset the adapter. Simulate failure for stop discovery. The event router
   // still owns the session. Make it appear inactive.
   SetUpMockAdapter();
   EXPECT_CALL(*session, IsActive()).WillOnce(testing::Return(false));
-  EXPECT_CALL(*mock_adapter_, RemoveObserver(testing::_));
   stop_function = setupFunction(new api::BluetoothStopDiscoveryFunction);
   error =
       utils::RunFunctionAndReturnError(stop_function.get(), "[]", browser());
   ASSERT_FALSE(error.empty());
   SetUpMockAdapter();
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothApiTest, DiscoveryCallback) {
   mock_session_.reset(new testing::NiceMock<MockBluetoothDiscoverySession>(
       scoped_refptr<BluetoothAdapter>(mock_adapter_)));
@@ skipping 181 matching lines @@
 }
 
 IN_PROC_BROWSER_TEST_F(BluetoothApiTest, GetDevices) {
   ResultCatcher catcher;
   catcher.RestrictToProfile(browser()->profile());
 
   BluetoothAdapter::ConstDeviceList devices;
   devices.push_back(device1_.get());
   devices.push_back(device2_.get());
 
-  EXPECT_CALL(*device1_, ProvidesServiceWithUUID(testing::_))
-      .WillOnce(testing::Return(false));
-
-  EXPECT_CALL(*device2_, ProvidesServiceWithUUID(testing::_))
-      .WillOnce(testing::Return(true));
-
   EXPECT_CALL(*mock_adapter_, GetDevices())
-      .Times(2)
+      .Times(1)
       .WillRepeatedly(testing::Return(devices));
 
   // Load and wait for setup
   ExtensionTestMessageListener listener("ready", true);
   ASSERT_TRUE(
       LoadExtension(test_data_dir_.AppendASCII("bluetooth/get_devices")));
   EXPECT_TRUE(listener.WaitUntilSatisfied());
 
   listener.Reply("go");
 
   EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
 }
-
-IN_PROC_BROWSER_TEST_F(BluetoothApiTest, GetDevicesError) {
-  ResultCatcher catcher;
-  catcher.RestrictToProfile(browser()->profile());
-
-  // Load and wait for setup
-  ExtensionTestMessageListener listener("ready", true);
-  ASSERT_TRUE(LoadExtension(
-        test_data_dir_.AppendASCII("bluetooth/get_devices_error")));
-  EXPECT_TRUE(listener.WaitUntilSatisfied());
-
-  listener.Reply("go");
-
-  EXPECT_TRUE(catcher.GetNextResult()) << catcher.message();
-}