Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(276)

Unified Diff: device/bluetooth/bluetooth_socket_win.cc

Issue 2891853003: Rename TaskRunner::RunsTasksOnCurrentThread() in //device, //services (Closed)
Patch Set: fixed build error Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « device/bluetooth/bluetooth_socket_net.cc ('k') | device/bluetooth/bluetooth_task_manager_win.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_socket_win.cc
diff --git a/device/bluetooth/bluetooth_socket_win.cc b/device/bluetooth/bluetooth_socket_win.cc
index a5793295e0a674da3b94d0595f09045f9e352174..1906b0bce3d7739ca5eed7e277c9093bd441bff7 100644
--- a/device/bluetooth/bluetooth_socket_win.cc
+++ b/device/bluetooth/bluetooth_socket_win.cc
@@ -78,7 +78,7 @@ scoped_refptr<BluetoothSocketWin>
BluetoothSocketWin::CreateBluetoothSocket(
scoped_refptr<base::SequencedTaskRunner> ui_task_runner,
scoped_refptr<device::BluetoothSocketThread> socket_thread) {
- DCHECK(ui_task_runner->RunsTasksOnCurrentThread());
+ DCHECK(ui_task_runner->RunsTasksInCurrentSequence());
return make_scoped_refptr(
new BluetoothSocketWin(ui_task_runner, socket_thread));
@@ -101,7 +101,7 @@ void BluetoothSocketWin::Connect(
const BluetoothUUID& uuid,
const base::Closure& success_callback,
const ErrorCompletionCallback& error_callback) {
- DCHECK(ui_task_runner()->RunsTasksOnCurrentThread());
+ DCHECK(ui_task_runner()->RunsTasksInCurrentSequence());
DCHECK(device);
if (!uuid.IsValid()) {
@@ -138,7 +138,7 @@ void BluetoothSocketWin::Listen(scoped_refptr<BluetoothAdapter> adapter,
const BluetoothAdapter::ServiceOptions& options,
const base::Closure& success_callback,
const ErrorCompletionCallback& error_callback) {
- DCHECK(ui_task_runner()->RunsTasksOnCurrentThread());
+ DCHECK(ui_task_runner()->RunsTasksInCurrentSequence());
adapter_ = adapter;
int rfcomm_channel = options.channel ? *options.channel : 0;
@@ -167,7 +167,7 @@ void BluetoothSocketWin::ResetData() {
void BluetoothSocketWin::Accept(
const AcceptCompletionCallback& success_callback,
const ErrorCompletionCallback& error_callback) {
- DCHECK(ui_task_runner()->RunsTasksOnCurrentThread());
+ DCHECK(ui_task_runner()->RunsTasksInCurrentSequence());
socket_thread()->task_runner()->PostTask(
FROM_HERE,
@@ -180,7 +180,7 @@ void BluetoothSocketWin::Accept(
void BluetoothSocketWin::DoConnect(
const base::Closure& success_callback,
const ErrorCompletionCallback& error_callback) {
- DCHECK(socket_thread()->task_runner()->RunsTasksOnCurrentThread());
+ DCHECK(socket_thread()->task_runner()->RunsTasksInCurrentSequence());
base::ThreadRestrictions::AssertIOAllowed();
if (tcp_socket()) {
@@ -237,7 +237,7 @@ void BluetoothSocketWin::DoListen(
int rfcomm_channel,
const base::Closure& success_callback,
const ErrorCompletionCallback& error_callback) {
- DCHECK(socket_thread()->task_runner()->RunsTasksOnCurrentThread());
+ DCHECK(socket_thread()->task_runner()->RunsTasksInCurrentSequence());
DCHECK(!tcp_socket() && !service_reg_data_);
// The valid range is 0-30. 0 means BT_PORT_ANY and 1-30 are the
@@ -337,7 +337,7 @@ void BluetoothSocketWin::DoListen(
void BluetoothSocketWin::DoAccept(
const AcceptCompletionCallback& success_callback,
const ErrorCompletionCallback& error_callback) {
- DCHECK(socket_thread()->task_runner()->RunsTasksOnCurrentThread());
+ DCHECK(socket_thread()->task_runner()->RunsTasksInCurrentSequence());
int result = tcp_socket()->Accept(
&accept_socket_,
&accept_address_,
@@ -355,7 +355,7 @@ void BluetoothSocketWin::OnAcceptOnSocketThread(
const AcceptCompletionCallback& success_callback,
const ErrorCompletionCallback& error_callback,
int accept_result) {
- DCHECK(socket_thread()->task_runner()->RunsTasksOnCurrentThread());
+ DCHECK(socket_thread()->task_runner()->RunsTasksInCurrentSequence());
if (accept_result != net::OK) {
LOG(WARNING) << "OnAccept error, net err=" << accept_result;
PostErrorCompletion(error_callback, kFailedToAccept);
@@ -377,7 +377,7 @@ void BluetoothSocketWin::OnAcceptOnUI(
const net::IPEndPoint& peer_address,
const AcceptCompletionCallback& success_callback,
const ErrorCompletionCallback& error_callback) {
- DCHECK(ui_task_runner()->RunsTasksOnCurrentThread());
+ DCHECK(ui_task_runner()->RunsTasksInCurrentSequence());
const std::string peer_device_address =
IPEndPointToBluetoothAddress(peer_address);
« no previous file with comments | « device/bluetooth/bluetooth_socket_net.cc ('k') | device/bluetooth/bluetooth_task_manager_win.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698