MD Settings: Bluetooth: Fix adapter state and discovery

extensions/browser/api/bluetooth/bluetooth_api.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_api.h"
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include "base/bind_helpers.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
+#include "components/device_event_log/device_event_log.h"
 #include "content/public/browser/browser_thread.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 #include "device/bluetooth/bluetooth_device.h"
 #include "extensions/browser/api/bluetooth/bluetooth_api_utils.h"
 #include "extensions/browser/api/bluetooth/bluetooth_event_router.h"
 #include "extensions/browser/event_router.h"
 #include "extensions/common/api/bluetooth.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
@@ skipping 33 matching lines @@
 
 // static
 BluetoothAPI* BluetoothAPI::Get(BrowserContext* context) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   return GetFactoryInstance()->Get(context);
 }
 
 BluetoothAPI::BluetoothAPI(content::BrowserContext* context)
     : browser_context_(context) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  BLUETOOTH_LOG(EVENT) << "BluetoothAPI: " << browser_context_;

[michaelpg, 2017/04/07 21:47:03]

is it normal to print a pointer?

[stevenjb, 2017/04/07 23:36:05]

I don't know about 'normal' but we do it. It can be helpful for identifying
which instance(s) are alive when there may be more than one.

   EventRouter* event_router = EventRouter::Get(browser_context_);
   event_router->RegisterObserver(this,
                                  bluetooth::OnAdapterStateChanged::kEventName);
   event_router->RegisterObserver(this, bluetooth::OnDeviceAdded::kEventName);
   event_router->RegisterObserver(this, bluetooth::OnDeviceChanged::kEventName);
   event_router->RegisterObserver(this, bluetooth::OnDeviceRemoved::kEventName);
 }
 
-BluetoothAPI::~BluetoothAPI() {}
+BluetoothAPI::~BluetoothAPI() {
+  BLUETOOTH_LOG(EVENT) << "~BluetoothAPI: " << browser_context_;
+}
 
 BluetoothEventRouter* BluetoothAPI::event_router() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (!event_router_) {
+    BLUETOOTH_LOG(EVENT) << "BluetoothAPI: Creating BluetoothEventRouter";
     event_router_.reset(new BluetoothEventRouter(browser_context_));
   }
   return event_router_.get();
 }
 
 void BluetoothAPI::Shutdown() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
+  BLUETOOTH_LOG(EVENT) << "BluetoothAPI: Shutdown";
   EventRouter::Get(browser_context_)->UnregisterObserver(this);
 }
 
 void BluetoothAPI::OnListenerAdded(const EventListenerInfo& details) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   if (event_router()->IsBluetoothSupported())
     event_router()->OnListenerAdded();
 }
 
 void BluetoothAPI::OnListenerRemoved(const EventListenerInfo& details) {
@@ skipping 100 matching lines @@
       ->StopDiscoverySession(
           adapter.get(), GetExtensionId(),
           base::Bind(&BluetoothStopDiscoveryFunction::OnSuccessCallback, this),
           base::Bind(&BluetoothStopDiscoveryFunction::OnErrorCallback, this));
 
   return true;
 }
 
 }  // namespace api
 }  // namespace extensions