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..8f92be8140f5b3563f72a29b1e08e6e26be5a5ed 100644 |
--- a/device/bluetooth/bluetooth_adapter_win.cc |
+++ b/device/bluetooth/bluetooth_adapter_win.cc |
@@ -14,6 +14,7 @@ |
#include "base/stl_util.h" |
#include "base/thread_task_runner_handle.h" |
#include "device/bluetooth/bluetooth_device_win.h" |
+#include "device/bluetooth/bluetooth_socket_thread_win.h" |
#include "device/bluetooth/bluetooth_task_manager_win.h" |
namespace device { |
@@ -185,7 +186,8 @@ void BluetoothAdapterWin::DevicesDiscovered( |
++iter) { |
if (discovered_devices_.find((*iter)->address) == |
discovered_devices_.end()) { |
- BluetoothDeviceWin device_win(**iter); |
+ BluetoothDeviceWin device_win( |
+ **iter, ui_task_runner_, socket_thread_, NULL, net::NetLog::Source()); |
FOR_EACH_OBSERVER(BluetoothAdapter::Observer, observers_, |
DeviceAdded(this, &device_win)); |
discovered_devices_.insert((*iter)->address); |
@@ -200,7 +202,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_, socket_thread_, NULL, net::NetLog::Source()); |
} |
} |
@@ -232,6 +235,7 @@ void BluetoothAdapterWin::RemoveDiscoverySession( |
void BluetoothAdapterWin::Init() { |
ui_task_runner_ = base::ThreadTaskRunnerHandle::Get(); |
+ socket_thread_ = BluetoothSocketThreadWin::Get(); |
task_manager_ = |
new BluetoothTaskManagerWin(ui_task_runner_); |
task_manager_->AddObserver(this); |