Replace NOTREACHED with VLOG in BluetoothEventRouter::AddPairingDelegateImpl

extensions/browser/api/bluetooth/bluetooth_event_router.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 <map>
 #include <string>
 #include <utility>
 
@@ skipping 222 matching lines @@
                    base::Bind(&BluetoothEventRouter::AddPairingDelegateImpl,
                               weak_ptr_factory_.GetWeakPtr(), extension_id)));
     return;
   }
   AddPairingDelegateImpl(extension_id);
 }
 
 void BluetoothEventRouter::AddPairingDelegateImpl(
     const std::string& extension_id) {
   if (!adapter_.get()) {
-    LOG(ERROR) << "Unable to get adatper.";
+    LOG(ERROR) << "Unable to get adatper for extension_id: " << extension_id;

[michaelpg, 2015/12/22 00:49:48]

adapter

[stevenjb, 2015/12/28 18:22:11]

Done.

     return;
   }
-  if (!ContainsKey(pairing_delegate_map_, extension_id)) {
-    BluetoothApiPairingDelegate* delegate =
-        new BluetoothApiPairingDelegate(browser_context_);
-    DCHECK(adapter_.get());
-    adapter_->AddPairingDelegate(
-        delegate, device::BluetoothAdapter::PAIRING_DELEGATE_PRIORITY_HIGH);
-    pairing_delegate_map_[extension_id] = delegate;
-  } else {
-    LOG(ERROR) << "Pairing delegate already exists for extension. "
-               << "There should be at most one onPairing listener.";
-    NOTREACHED();
+  if (ContainsKey(pairing_delegate_map_, extension_id)) {
+    // For WebUI there may be more than one page open to the same url
+    // (e.g. chrome://settings). These will share the same pairing delegate.
+    VLOG(1) << "Pairing delegate already exists for extension_id: "
+            << extension_id;
+    return;
   }
+  BluetoothApiPairingDelegate* delegate =
+      new BluetoothApiPairingDelegate(browser_context_);
+  DCHECK(adapter_.get());
+  adapter_->AddPairingDelegate(
+      delegate, device::BluetoothAdapter::PAIRING_DELEGATE_PRIORITY_HIGH);
+  pairing_delegate_map_[extension_id] = delegate;
 }
 
 void BluetoothEventRouter::RemovePairingDelegate(
     const std::string& extension_id) {
   if (ContainsKey(pairing_delegate_map_, extension_id)) {
     BluetoothApiPairingDelegate* delegate = pairing_delegate_map_[extension_id];
     if (adapter_.get())
       adapter_->RemovePairingDelegate(delegate);
     pairing_delegate_map_.erase(extension_id);
     delete delegate;
@@ skipping 200 matching lines @@
 }
 
 void BluetoothEventRouter::OnExtensionUnloaded(
     content::BrowserContext* browser_context,
     const Extension* extension,
     UnloadedExtensionInfo::Reason reason) {
   CleanUpForExtension(extension->id());
 }
 
 }  // namespace extensions