work in progress

content/browser/bluetooth/bluetooth_device_chooser_controller.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.
 
 #include "content/browser/bluetooth/bluetooth_device_chooser_controller.h"
 
 #include <set>
 #include <string>
 #include <unordered_set>
 
@@ skipping 219 matching lines @@
     std::unique_ptr<device::BluetoothDiscoverySession> discovery_session) {
   // Nothing goes wrong if the discovery session fails to stop, and we don't
   // need to wait for it before letting the user's script proceed, so we ignore
   // the results here.
   discovery_session->Stop(base::Bind(&base::DoNothing),
                           base::Bind(&base::DoNothing));
 }
 
 UMARequestDeviceOutcome OutcomeFromChooserEvent(BluetoothChooser::Event event) {
   switch (event) {
+    case BluetoothChooser::Event::ADAPTER_DISCOVERING_CHANGED:
+      return UMARequestDeviceOutcome::BLUETOOTH_CHOOSER_CANCELLED;
     case BluetoothChooser::Event::DENIED_PERMISSION:
       return UMARequestDeviceOutcome::BLUETOOTH_CHOOSER_DENIED_PERMISSION;
     case BluetoothChooser::Event::CANCELLED:
       return UMARequestDeviceOutcome::BLUETOOTH_CHOOSER_CANCELLED;
     case BluetoothChooser::Event::SHOW_OVERVIEW_HELP:
       return UMARequestDeviceOutcome::BLUETOOTH_OVERVIEW_HELP_LINK_PRESSED;
     case BluetoothChooser::Event::SHOW_ADAPTER_OFF_HELP:
       return UMARequestDeviceOutcome::ADAPTER_OFF_HELP_LINK_PRESSED;
     case BluetoothChooser::Event::SHOW_NEED_LOCATION_HELP:
       return UMARequestDeviceOutcome::NEED_LOCATION_HELP_LINK_PRESSED;
@@ skipping 207 matching lines @@
       OnBluetoothChooserEvent(BluetoothChooser::Event::RESCAN,
                               "" /* device_address */);
     }
   }
 
   if (!powered) {
     discovery_session_timer_.Stop();
   }
 }
 
+void BluetoothDeviceChooserController::AdapterDiscoveringChanged(
+    bool discovering) {
+  if (!discovering && IsDiscoverySessionActive())
+    StopDeviceDiscovery();
+}
+
 int BluetoothDeviceChooserController::CalculateSignalStrengthLevel(
     int8_t rssi) {
   RecordRSSISignalStrength(rssi);
 
   if (rssi < k20thPercentileRSSI) {
     RecordRSSISignalStrengthLevel(content::UMARSSISignalStrengthLevel::LEVEL_0);
     return 0;
   } else if (rssi < k40thPercentileRSSI) {
     RecordRSSISignalStrengthLevel(content::UMARSSISignalStrengthLevel::LEVEL_1);
     return 1;
@@ skipping 17 matching lines @@
   for (const device::BluetoothDevice* device : adapter_->GetDevices()) {
     if (device->IsGattConnected()) {
       AddFilteredDevice(*device);
     }
   }
 }
 
 void BluetoothDeviceChooserController::StartDeviceDiscovery() {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
-  if (discovery_session_.get() && discovery_session_->IsActive()) {
+  if (IsDiscoverySessionActive()) {
     // Already running; just increase the timeout.
     discovery_session_timer_.Reset();
     return;
   }
 
   scanning_start_time_ = base::TimeTicks::Now();
 
   chooser_->ShowDiscoveryState(BluetoothChooser::DiscoveryState::DISCOVERING);
   adapter_->StartDiscoverySessionWithFilter(
       ComputeScanFilter(options_->filters),
@@ skipping 54 matching lines @@
       DCHECK(chooser_);
       StartDeviceDiscovery();
       // No need to close the chooser so we return.
       return;
     case BluetoothChooser::Event::DENIED_PERMISSION:
       RecordRequestDeviceOutcome(OutcomeFromChooserEvent(event));
       PostErrorCallback(blink::mojom::WebBluetoothResult::
                             CHOOSER_NOT_SHOWN_USER_DENIED_PERMISSION_TO_SCAN);
       break;
     case BluetoothChooser::Event::CANCELLED:
+      LOG(ERROR) << "[DJKim] "
+                    "BluetoothDeviceChooserController::OnBluetoothChooserEvent "
+                    ">> CANCELLED";
       RecordRequestDeviceOutcome(OutcomeFromChooserEvent(event));
       PostErrorCallback(blink::mojom::WebBluetoothResult::CHOOSER_CANCELLED);
       break;
     case BluetoothChooser::Event::SHOW_OVERVIEW_HELP:
       DVLOG(1) << "Overview Help link pressed.";
       RecordRequestDeviceOutcome(OutcomeFromChooserEvent(event));
       PostErrorCallback(blink::mojom::WebBluetoothResult::CHOOSER_CANCELLED);
       break;
     case BluetoothChooser::Event::SHOW_ADAPTER_OFF_HELP:
       DVLOG(1) << "Adapter Off Help link pressed.";
       RecordRequestDeviceOutcome(OutcomeFromChooserEvent(event));
       PostErrorCallback(blink::mojom::WebBluetoothResult::CHOOSER_CANCELLED);
       break;
     case BluetoothChooser::Event::SHOW_NEED_LOCATION_HELP:
       DVLOG(1) << "Need Location Help link pressed.";
       RecordRequestDeviceOutcome(OutcomeFromChooserEvent(event));
       PostErrorCallback(blink::mojom::WebBluetoothResult::CHOOSER_CANCELLED);
       break;
     case BluetoothChooser::Event::SELECTED:
       RecordNumOfDevices(options_->accept_all_devices, device_ids_.size());
       // RecordRequestDeviceOutcome is called in the callback, because the
       // device may have vanished.
       PostSuccessCallback(device_address);
       break;
+    case BluetoothChooser::Event::ADAPTER_DISCOVERING_CHANGED:
+      RecordRequestDeviceOutcome(OutcomeFromChooserEvent(event));
+      PostErrorCallback(blink::mojom::WebBluetoothResult::CHOOSER_CANCELLED);
+      break;
   }
   // Close chooser.
   chooser_.reset();
 }
 
 void BluetoothDeviceChooserController::PostSuccessCallback(
     const std::string& device_address) {
   if (!base::ThreadTaskRunnerHandle::Get()->PostTask(
           FROM_HERE,
           base::Bind(success_callback_, base::Passed(std::move(options_)),
                      device_address))) {
     LOG(WARNING) << "No TaskRunner.";
   }
 }
 
 void BluetoothDeviceChooserController::PostErrorCallback(
     blink::mojom::WebBluetoothResult error) {
   if (!base::ThreadTaskRunnerHandle::Get()->PostTask(
           FROM_HERE, base::Bind(error_callback_, error))) {
     LOG(WARNING) << "No TaskRunner.";
   }
 }
 
+bool BluetoothDeviceChooserController::IsDiscoverySessionActive() {
+  if (discovery_session_ && discovery_session_->IsActive())
+    return true;
+
+  return false;
+}
+
 }  // namespace content