| Index: content/browser/bluetooth/bluetooth_device_chooser_controller.cc
|
| diff --git a/content/browser/bluetooth/bluetooth_device_chooser_controller.cc b/content/browser/bluetooth/bluetooth_device_chooser_controller.cc
|
| index 16a3630a279531bd04e2738d10730221c5675934..278510b71d649357b7aaebd88bb7c08efe1c085d 100644
|
| --- a/content/browser/bluetooth/bluetooth_device_chooser_controller.cc
|
| +++ b/content/browser/bluetooth/bluetooth_device_chooser_controller.cc
|
| @@ -198,8 +198,7 @@ UMARequestDeviceOutcome OutcomeFromChooserEvent(BluetoothChooser::Event event) {
|
| BluetoothDeviceChooserController::BluetoothDeviceChooserController(
|
| WebBluetoothServiceImpl* web_bluetooth_service,
|
| RenderFrameHost* render_frame_host,
|
| - device::BluetoothAdapter* adapter,
|
| - base::TimeDelta scan_duration)
|
| + device::BluetoothAdapter* adapter)
|
| : adapter_(adapter),
|
| web_bluetooth_service_(web_bluetooth_service),
|
| render_frame_host_(render_frame_host),
|
| @@ -208,7 +207,7 @@ BluetoothDeviceChooserController::BluetoothDeviceChooserController(
|
| FROM_HERE,
|
| // TODO(jyasskin): Add a way for tests to control the dialog
|
| // directly, and change this to a reasonable discovery timeout.
|
| - scan_duration,
|
| + GetContentClient()->browser()->GetBluetoothScanDuration(),
|
| base::Bind(&BluetoothDeviceChooserController::StopDeviceDiscovery,
|
| // base::Timer guarantees it won't call back after its
|
| // destructor starts.
|
|
|