MD Settings: Bluetooth: Fix adapter state and discovery

extensions/browser/api/bluetooth/bluetooth_event_router.h

 // 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.
 
 #ifndef EXTENSIONS_BROWSER_API_BLUETOOTH_BLUETOOTH_EVENT_ROUTER_H_
 #define EXTENSIONS_BROWSER_API_BLUETOOTH_BLUETOOTH_EVENT_ROUTER_H_
 
 #include <map>
 
 #include "base/callback_forward.h"
@@ skipping 17 matching lines @@
 namespace device {
 
 class BluetoothDevice;
 class BluetoothDiscoverySession;
 
 }  // namespace device
 
 namespace extensions {
 class BluetoothApiPairingDelegate;
 class ExtensionRegistry;
+struct EventListenerInfo;
 
 class BluetoothEventRouter : public device::BluetoothAdapter::Observer,
                              public content::NotificationObserver,
                              public ExtensionRegistryObserver {
  public:
   explicit BluetoothEventRouter(content::BrowserContext* context);
   ~BluetoothEventRouter() override;
 
   // Returns true if adapter_ has been initialized for testing or bluetooth
   // adapter is available for the current platform.
@@ skipping 26 matching lines @@
   // Callback is called, if the filter was successfully updated.
   // |error_callback| is called, if filter update failed.
   void SetDiscoveryFilter(
       std::unique_ptr<device::BluetoothDiscoveryFilter> discovery_filter,
       device::BluetoothAdapter* adapter,
       const std::string& extension_id,
       const base::Closure& callback,
       const base::Closure& error_callback);
 
   // Called when a bluetooth event listener is added.
-  void OnListenerAdded();
+  void OnListenerAdded(const EventListenerInfo& details);
 
   // Called when a bluetooth event listener is removed.
-  void OnListenerRemoved();
+  void OnListenerRemoved(const EventListenerInfo& details);
 
   // Adds a pairing delegate for an extension.
   void AddPairingDelegate(const std::string& extension_id);
 
   // Removes the pairing delegate for an extension.
   void RemovePairingDelegate(const std::string& extension_id);
 
   // Returns the pairing delegate for an extension or NULL if it doesn't have a
   // pairing delegate.
   BluetoothApiPairingDelegate* GetPairingDelegate(
@@ skipping 54 matching lines @@
       const std::string& extension_id,
       const base::Closure& callback,
       std::unique_ptr<device::BluetoothDiscoverySession> discovery_session);
 
   void OnSetDiscoveryFilter(const std::string& extension_id,
                             const base::Closure& callback);
 
   content::BrowserContext* browser_context_;
   scoped_refptr<device::BluetoothAdapter> adapter_;
 
-  int num_event_listeners_;
+  // Map of listener id -> listener count.
+  std::map<std::string, int> event_listener_count_;
 
   // A map that maps extension ids to BluetoothDiscoverySession pointers.
   typedef std::map<std::string, device::BluetoothDiscoverySession*>
       DiscoverySessionMap;
   DiscoverySessionMap discovery_session_map_;
 
   typedef std::map<std::string, device::BluetoothDiscoveryFilter*>
       PreSetFilterMap;
 
   // Maps an extension id to it's pre-set discovery filter.
@@ skipping 10 matching lines @@
       extension_registry_observer_;
 
   base::WeakPtrFactory<BluetoothEventRouter> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BluetoothEventRouter);
 };
 
 }  // namespace extensions
 
 #endif  // EXTENSIONS_BROWSER_API_BLUETOOTH_BLUETOOTH_EVENT_ROUTER_H_