bluetooth: Fix logic mistake in DeviceChanged

content/browser/bluetooth/web_bluetooth_service_impl.cc

 // Copyright 2016 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
 // WebBluetoothServiceImpl map [service_id_to_device_address_,
 // characteristic_id_to_service_id_, 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 199 matching lines @@
   if (device_chooser_controller_.get()) {
     VLOG(1) << "Adding device to device chooser controller: "
             << device->GetAddress();
     device_chooser_controller_->AddFilteredDevice(*device);
   }
 }
 
 void WebBluetoothServiceImpl::DeviceChanged(device::BluetoothAdapter* adapter,
                                             device::BluetoothDevice* device) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
-  if (!device->IsGattConnected() || !device->IsConnected()) {
+  if (!device->IsGattConnected() && !device->IsConnected()) {

[Jeffrey Yasskin, 2016/05/28 02:48:00]

Should we only check one of these? All of our connections are GATT-based, so
maybe just IsGattConnected()?

[Jeffrey Yasskin, 2016/05/28 03:49:52]

Does it make sense to implement it to forward to IsConnected() there, and then
have this call site do the long-term thing?

[ortuno, 2016/05/31 16:33:21]

Done. I thought it was going to be much harder so I went for the one line change
here, since we have to request a merge for this. But it turns out implementing
IsGattConnected was also a one line change :)

     std::string device_id =
         connected_devices_->CloseConnectionToDeviceWithAddress(
             device->GetAddress());
     if (!device_id.empty()) {
       if (client_) {
         client_->GattServerDisconnected(device_id);
       }
     }
   }
 }
@@ skipping 721 matching lines @@
   characteristic_id_to_service_id_.clear();
   service_id_to_device_address_.clear();
   connected_devices_.reset(
       new FrameConnectedBluetoothDevices(render_frame_host_));
   allowed_devices_map_ = BluetoothAllowedDevicesMap();
   device_chooser_controller_.reset();
   GetBluetoothAdapterFactoryWrapper()->ReleaseAdapter(this);
 }
 
 }  // namespace content