bluetooth: Handle two consecutives requestDevice calls.

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 200 matching lines @@
           scan_duration,
           base::Bind(&BluetoothDeviceChooserController::StopDeviceDiscovery,
                      // base::Timer guarantees it won't call back after its
                      // destructor starts.
                      base::Unretained(this)),
           /*is_repeating=*/false),
       weak_ptr_factory_(this) {
   CHECK(adapter_);
 }
 
-BluetoothDeviceChooserController::~BluetoothDeviceChooserController() {}
+BluetoothDeviceChooserController::~BluetoothDeviceChooserController() {
+  if (chooser_) {
+    error_callback_.Run(blink::mojom::WebBluetoothError::CHOOSER_CANCELLED);

[Jeffrey Yasskin, 2016/06/10 00:49:22]

DCHECK(!error_callback_.is_null())? It'll crash in .Run() anyway, but it's nice
to see that we think there's an invariant that chooser_ implies a non-null
callback.

[ortuno, 2016/06/10 18:10:07]

Done.

+  }
+}
 
 void BluetoothDeviceChooserController::GetDevice(
     blink::mojom::WebBluetoothRequestDeviceOptionsPtr options,
     const SuccessCallback& success_callback,
     const ErrorCallback& error_callback) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
 
   // GetDevice should only be called once.
   DCHECK(success_callback_.is_null());
   DCHECK(error_callback_.is_null());
@@ skipping 247 matching lines @@
 
 void BluetoothDeviceChooserController::PostErrorCallback(
     blink::mojom::WebBluetoothError error) {
   if (!base::ThreadTaskRunnerHandle::Get()->PostTask(
           FROM_HERE, base::Bind(error_callback_, error))) {
     LOG(WARNING) << "No TaskRunner.";
   }
 }
 
 }  // namespace content