MD Settings: Bluetooth: Fix adapter state and discovery

extensions/browser/api/bluetooth/bluetooth_event_router_unittest.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 "extensions/browser/api/bluetooth/bluetooth_event_router.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "content/public/test/test_browser_context.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "device/bluetooth/bluetooth_common.h"
 #include "device/bluetooth/bluetooth_uuid.h"
 #include "device/bluetooth/test/mock_bluetooth_adapter.h"
+#include "extensions/browser/event_router.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/extensions_test.h"
 #include "extensions/common/api/bluetooth.h"
 #include "extensions/common/extension_builder.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace {
 
 const char kTestExtensionId[] = "test extension id";
@@ skipping 24 matching lines @@
     ExtensionsTest::TearDown();
   }
 
  protected:
   content::TestBrowserThreadBundle test_browser_thread_bundle_;
   testing::StrictMock<device::MockBluetoothAdapter>* mock_adapter_;
   std::unique_ptr<BluetoothEventRouter> router_;
 };
 
 TEST_F(BluetoothEventRouterTest, BluetoothEventListener) {
-  router_->OnListenerAdded();
+  EventListenerInfo info("", "", GURL(), nullptr);
+  router_->OnListenerAdded(info);
   EXPECT_CALL(*mock_adapter_, RemoveObserver(testing::_)).Times(1);
-  router_->OnListenerRemoved();
+  router_->OnListenerRemoved(info);
 }
 
 TEST_F(BluetoothEventRouterTest, MultipleBluetoothEventListeners) {
-  router_->OnListenerAdded();
-  router_->OnListenerAdded();
-  router_->OnListenerAdded();
-  router_->OnListenerRemoved();
-  router_->OnListenerRemoved();
+  EventListenerInfo info("", "", GURL(), nullptr);

[rkc, 2017/04/12 17:58:52]

Can we expand this test (or add additional tests) to test for more combinations
of URLs and extension ID's?

[stevenjb, 2017/04/12 18:08:56]

It would be a fair bit of work to add a meaningful test for multiple extensions
and WebUI host I think, and frankly I would want to significantly refactor this
code and test the refactor. However, I'm not really in a position to take
ownership of this code just now...

+  router_->OnListenerAdded(info);
+  router_->OnListenerAdded(info);
+  router_->OnListenerAdded(info);
+  router_->OnListenerRemoved(info);
+  router_->OnListenerRemoved(info);
   EXPECT_CALL(*mock_adapter_, RemoveObserver(testing::_)).Times(1);
-  router_->OnListenerRemoved();
+  router_->OnListenerRemoved(info);
 }
 
 TEST_F(BluetoothEventRouterTest, UnloadExtension) {
   scoped_refptr<const Extension> extension =
       ExtensionBuilder()
           .SetManifest(DictionaryBuilder()
                            .Set("name", "BT event router test")
                            .Set("version", "1.0")
                            .Set("manifest_version", 2)
                            .Build())
@@ skipping 27 matching lines @@
                                   testing::_, testing::_)).Times(1);
 
   router_->StartDiscoverySession(mock_adapter_, kTestExtensionId,
                                  base::Bind(&base::DoNothing),
                                  base::Bind(&base::DoNothing));
 
   EXPECT_CALL(*mock_adapter_, RemoveObserver(testing::_)).Times(1);
 }
 
 }  // namespace extensions