Commit f928849b authored by fdoray's avatar fdoray Committed by Commit bot

Remove use of deprecated MessageLoop methods in blimp.

MessageLoop::PostTask/PostDelayedTask/DeleteSoon/ReleaseSoon
are deprecated. This CL makes the following replacements to
remove some uses of these methods:

"MessageLoop(ForUI|ForIO)::current()->PostTask" ->
  "ThreadTaskRunnerHandle::Get()->PostTask"
"MessageLoop(ForUI|ForIO)::current()->PostDelayedTask" ->
  "ThreadTaskRunnerHandle::Get()->PostDelayedTask"
"MessageLoop(ForUI|ForIO)::current()->DeleteSoon" ->
  "ThreadTaskRunnerHandle::Get()->DeleteSoon"
"MessageLoop(ForUI|ForIO)::current()->ReleaseSoon" ->
  "ThreadTaskRunnerHandle::Get()->ReleaseSoon"

In files where these replacements are made, it adds these includes:
  #include "base/location.h"
  #include "base/single_thread_task_runner.h"
  #include "base/threading/thread_task_runner_handle.h"

And removes this include if it is no longer required:
  #include "base/message_loop/message_loop.h"

Why ThreadTaskRunnerHandle::Get() instead of
MessageLoop::current()->task_runner()?
 - The two are equivalent on threads that run a MessageLoop.
 - MessageLoop::current() doesn't work in base/task_scheduler
   because the scheduler's thread don't run MessageLoops.
   This CL will therefore facilitate the migration of browser
   threads to base/task_scheduler.

Steps to generate this patch:
1. Run message_loop_cleanup.py (see this CL's comments).
2. Run tools/sort-headers.py on modified files.
3. Run git cl format.

BUG=616447
R=dtrainor@chromium.org

Review-Url: https://codereview.chromium.org/2034703003
Cr-Commit-Position: refs/heads/master@{#398149}
parent 9b6d81f1
......@@ -6,9 +6,11 @@
#include <algorithm>
#include "base/location.h"
#include "base/macros.h"
#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "blimp/common/logging.h"
#include "blimp/common/proto/blimp_message.pb.h"
#include "net/base/net_errors.h"
......@@ -104,7 +106,7 @@ void BlimpMessageOutputBuffer::OnMessageCheckpoint(int64_t message_id) {
<< " (max=" << current_buffer_size_bytes_ << ")";
if (!ack_entry.callback.is_null()) {
base::MessageLoop::current()->PostTask(
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(ack_entry.callback, net::OK));
}
......
......@@ -4,9 +4,12 @@
#include <memory>
#include "base/location.h"
#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "blimp/common/blob_cache/id_util.h"
#include "blimp/common/blob_cache/in_memory_blob_cache.h"
#include "blimp/common/blob_cache/test_util.h"
......@@ -37,7 +40,7 @@ class SenderDelegateProxy : public BlobChannelSender::Delegate {
private:
// BlobChannelSender implementation.
void DeliverBlob(const BlobId& id, BlobDataPtr data) override {
base::MessageLoop::current()->PostTask(
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(&BlobChannelReceiver::OnBlobReceived,
base::Unretained(receiver_), id, data));
}
......
......@@ -9,9 +9,12 @@
#include <string>
#include "base/callback_helpers.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "blimp/common/proto/blimp_message.pb.h"
#include "blimp/net/blimp_message_processor.h"
#include "blimp/net/common.h"
......@@ -99,7 +102,7 @@ class FakeBlimpConnection : public BlimpConnection,
// BlimpMessageProcessor implementation.
void ProcessMessage(std::unique_ptr<BlimpMessage> message,
const net::CompletionCallback& callback) override {
base::MessageLoop::current()->PostTask(
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(&FakeBlimpConnection::ForwardMessage,
base::Unretained(this), base::Passed(&message)));
......
......@@ -7,10 +7,12 @@
#include <iostream>
#include "base/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/sys_byteorder.h"
#include "base/threading/thread_task_runner_handle.h"
#include "blimp/net/blimp_connection_statistics.h"
#include "blimp/net/common.h"
#include "net/base/io_buffer.h"
......@@ -68,7 +70,7 @@ void StreamPacketReader::ReadPacket(
payload_buffer_ = nullptr;
// Adapt synchronous completion to an asynchronous style.
base::MessageLoop::current()->PostTask(
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(callback, result == net::OK ? payload_size_ : result));
} else {
......
......@@ -7,10 +7,12 @@
#include <iostream>
#include "base/callback_helpers.h"
#include "base/location.h"
#include "base/logging.h"
#include "base/memory/ref_counted.h"
#include "base/message_loop/message_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/sys_byteorder.h"
#include "base/threading/thread_task_runner_handle.h"
#include "blimp/common/proto/blimp_message.pb.h"
#include "blimp/net/blimp_connection_statistics.h"
#include "blimp/net/common.h"
......@@ -73,8 +75,8 @@ void StreamPacketWriter::WritePacket(
payload_buffer_ = nullptr;
// Adapt synchronous completion to an asynchronous style.
base::MessageLoop::current()->PostTask(FROM_HERE,
base::Bind(callback, result));
base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
base::Bind(callback, result));
} else {
callback_ = callback;
}
......
......@@ -8,8 +8,10 @@
#include "base/callback.h"
#include "base/callback_helpers.h"
#include "base/location.h"
#include "base/memory/ptr_util.h"
#include "base/message_loop/message_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread_task_runner_handle.h"
#include "blimp/net/stream_socket_connection.h"
#include "net/socket/stream_socket.h"
#include "net/socket/tcp_server_socket.h"
......@@ -37,8 +39,8 @@ void TCPEngineTransport::Connect(const net::CompletionCallback& callback) {
int result = server_socket_->Listen(address_, 5);
if (result != net::OK) {
server_socket_.reset();
base::MessageLoop::current()->PostTask(FROM_HERE,
base::Bind(callback, result));
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(callback, result));
return;
}
}
......@@ -57,8 +59,8 @@ void TCPEngineTransport::Connect(const net::CompletionCallback& callback) {
server_socket_.reset();
}
base::MessageLoop::current()->PostTask(FROM_HERE,
base::Bind(callback, result));
base::ThreadTaskRunnerHandle::Get()->PostTask(FROM_HERE,
base::Bind(callback, result));
}
std::unique_ptr<BlimpConnection> TCPEngineTransport::TakeConnection() {
......
......@@ -8,7 +8,9 @@
#include "base/memory/ptr_util.h"
#include "base/memory/ref_counted.h"
#include "base/message_loop/message_loop.h"
#include "base/single_thread_task_runner.h"
#include "base/threading/thread.h"
#include "base/threading/thread_task_runner_handle.h"
#include "blimp/common/create_blimp_message.h"
#include "blimp/net/blimp_message_thread_pipe.h"
#include "blimp/net/browser_connection_handler.h"
......@@ -73,7 +75,7 @@ class FakeFeaturePeer : public BlimpMessageProcessor {
const net::CompletionCallback& callback) override {
DCHECK(task_runner_->RunsTasksOnCurrentThread());
ASSERT_EQ(feature_case_, message->feature_case());
base::MessageLoop::current()->PostTask(
base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(&FakeFeaturePeer::ForwardMessage,
base::Unretained(this), base::Passed(&message)));
if (!callback.is_null())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment