| Index: device/bluetooth/bluetooth_adapter_win.cc
|
| diff --git a/device/bluetooth/bluetooth_adapter_win.cc b/device/bluetooth/bluetooth_adapter_win.cc
|
| index bf0a9b7ebf5088d37de46afd9bba21336fd34860..b5345cf66e972507094ea569e1aa1c3a924d98e7 100644
|
| --- a/device/bluetooth/bluetooth_adapter_win.cc
|
| +++ b/device/bluetooth/bluetooth_adapter_win.cc
|
| @@ -185,7 +185,11 @@ void BluetoothAdapterWin::DevicesDiscovered(
|
| ++iter) {
|
| if (discovered_devices_.find((*iter)->address) ==
|
| discovered_devices_.end()) {
|
| - BluetoothDeviceWin device_win(**iter);
|
| + BluetoothDeviceWin device_win(**iter,
|
| + ui_task_runner_,
|
| + file_task_runner_,
|
| + net_log_,
|
| + net_log_source_);
|
| FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_,
|
| DeviceAdded(this, &device_win));
|
| discovered_devices_.insert((*iter)->address);
|
| @@ -200,7 +204,8 @@ void BluetoothAdapterWin::DevicesUpdated(
|
| devices.begin();
|
| iter != devices.end();
|
| ++iter) {
|
| - devices_[(*iter)->address] = new BluetoothDeviceWin(**iter);
|
| + devices_[(*iter)->address] = new BluetoothDeviceWin(
|
| + **iter, ui_task_runner_, file_task_runner_, net_log_, net_log_source_);
|
| }
|
| }
|
|
|
| @@ -248,6 +253,17 @@ void BluetoothAdapterWin::InitForTest(
|
| task_manager_->InitializeWithBluetoothTaskRunner(bluetooth_task_runner);
|
| }
|
|
|
| +void BluetoothAdapterWin::PostInit(
|
| + scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
|
| + scoped_refptr<base::SequencedTaskRunner> file_task_runner,
|
| + net::NetLog* net_log,
|
| + const net::NetLog::Source& net_log_source) {
|
| + ui_task_runner_ = ui_task_runner;
|
| + file_task_runner_ = file_task_runner;
|
| + net_log_ = net_log;
|
| + net_log_source_ = net_log_source;
|
| +}
|
| +
|
| void BluetoothAdapterWin::MaybePostStartDiscoveryTask() {
|
| if (discovery_status_ == NOT_DISCOVERING &&
|
| !on_start_discovery_callbacks_.empty()) {
|
|
|