bluetooth: Remove indicator only when there are no more devices connected

content/browser/bluetooth/bluetooth_dispatcher_host.cc

 // Copyright 2014 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.
 
 // ID Not In Map Note:
 // A service, characteristic, or descriptor ID not in the corresponding
 // BluetoothDispatcherHost map [service_to_device_, characteristic_to_service_,
 // descriptor_to_characteristic_] implies a hostile renderer because a renderer
 // obtains the corresponding ID from this class and it will be added to the map
 // at that time.
@@ skipping 706 matching lines @@
   // in case a hostile renderer is trying to disconnect a device that the
   // renderer is not allowed to access.
   if (allowed_devices_map_.GetDeviceAddress(GetOrigin(frame_routing_id),
                                             device_id)
           .empty()) {
     bad_message::ReceivedBadMessage(
         this, bad_message::BDH_DEVICE_NOT_ALLOWED_FOR_ORIGIN);
     return;
   }
 
-  RenderFrameHostImpl* render_frame_host =
-      RenderFrameHostImpl::FromID(render_process_id_, frame_routing_id);
-  WebContents* web_contents =
-      WebContents::FromRenderFrameHost(render_frame_host);
-  if (web_contents) {
-    web_contents->SetBluetoothDeviceConnected(false);
-  }
-
   // The last BluetoothGattConnection for a device closes the connection when
   // it's destroyed.
   if (device_id_to_connection_map_.erase(device_id)) {
     VLOG(1) << "Disconnecting device: " << device_id;
+
+    if (!device_id_to_connection_map_.empty()) {

[Jeffrey Yasskin, 2016/03/31 16:18:43]

Currently, this is going to keep the indicator showing if any frame from the
process is connected, right? This is better than what we had, but we really
ought to maintain the indicator if there are any connections from the current
WebContents, and drop it if there are connections from other WebContents that
happen to share a process.

[ortuno, 2016/03/31 17:53:25]

OK. What do you think of the new approach?

+      // Another device is still connected.
+      return;

[Jeffrey Yasskin, 2016/03/31 16:18:43]

For this sort of thing, I'd avoid returning early, in case we add another task
to disconnection that should happen even if there are some other connections in
the tab.

+    }
+
+    // Indicate no more BT devices are connected.
+    RenderFrameHostImpl* render_frame_host =
+        RenderFrameHostImpl::FromID(render_process_id_, frame_routing_id);
+    WebContents* web_contents =
+        WebContents::FromRenderFrameHost(render_frame_host);
+    if (web_contents) {
+      web_contents->SetBluetoothDeviceConnected(false);
+    }
   }
 }
 
 void BluetoothDispatcherHost::OnGetPrimaryService(
     int thread_id,
     int request_id,
     int frame_routing_id,
     const std::string& device_id,
     const std::string& service_uuid) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ skipping 931 matching lines @@
 
 bool BluetoothDispatcherHost::CanFrameAccessCharacteristicInstance(
     int frame_routing_id,
     const std::string& characteristic_instance_id) {
   return QueryCacheForCharacteristic(GetOrigin(frame_routing_id),
                                      characteristic_instance_id)
              .outcome != CacheQueryOutcome::BAD_RENDERER;
 }
 
 }  // namespace content