Index: device/bluetooth/bluetooth_device_win.cc |
diff --git a/device/bluetooth/bluetooth_device_win.cc b/device/bluetooth/bluetooth_device_win.cc |
index 3f95efd9b1d87e3713a63a79b81b839a3298ef24..943402cddeded0749efbbfb428b3dc37e1f1481c 100644 |
--- a/device/bluetooth/bluetooth_device_win.cc |
+++ b/device/bluetooth/bluetooth_device_win.cc |
@@ -9,6 +9,7 @@ |
#include "base/basictypes.h" |
#include "base/logging.h" |
#include "base/memory/scoped_vector.h" |
+#include "base/sequenced_task_runner.h" |
#include "base/strings/stringprintf.h" |
#include "device/bluetooth/bluetooth_out_of_band_pairing_data.h" |
#include "device/bluetooth/bluetooth_profile_win.h" |
@@ -183,29 +184,25 @@ void BluetoothDeviceWin::Forget(const ErrorCallback& error_callback) { |
void BluetoothDeviceWin::ConnectToService( |
const std::string& service_uuid, |
const SocketCallback& callback) { |
- for (ServiceRecordList::const_iterator iter = service_record_list_.begin(); |
- iter != service_record_list_.end(); |
- ++iter) { |
- if ((*iter)->uuid() == service_uuid) { |
- // If multiple service records are found, use the first one that works. |
- scoped_refptr<BluetoothSocket> socket( |
- BluetoothSocketWin::CreateBluetoothSocket(**iter)); |
- if (socket.get() != NULL) { |
- callback.Run(socket); |
- return; |
- } |
- } |
- } |
+ NOTIMPLEMENTED(); |
} |
void BluetoothDeviceWin::ConnectToProfile( |
device::BluetoothProfile* profile, |
+ scoped_refptr<base::SequencedTaskRunner> ui_task_runner, |
+ scoped_refptr<base::SequencedTaskRunner> file_task_runner, |
+ net::NetLog* net_log, |
+ const net::NetLog::Source& source, |
const base::Closure& callback, |
const ErrorCallback& error_callback) { |
- if (static_cast<BluetoothProfileWin*>(profile)->Connect(this)) |
- callback.Run(); |
- else |
- error_callback.Run(); |
+ DCHECK(ui_task_runner->RunsTasksOnCurrentThread()); |
+ static_cast<BluetoothProfileWin*>(profile)->Connect(this, |
+ ui_task_runner, |
+ file_task_runner, |
+ net_log, |
+ source, |
+ callback, |
+ error_callback); |
} |
void BluetoothDeviceWin::SetOutOfBandPairingData( |