net: Remove use of MessageLoopProxy and deprecated MessageLoop APIs
This patch was mostly autogenerated with https://codereview.chromium.org/1010073002/.
BUG=465354
Review URL: https://codereview.chromium.org/1170183002
Cr-Commit-Position: refs/heads/master@{#333929}
diff --git a/net/websockets/websocket_channel.cc b/net/websockets/websocket_channel.cc
index b5656e5..254c6a41 100644
--- a/net/websockets/websocket_channel.cc
+++ b/net/websockets/websocket_channel.cc
@@ -13,13 +13,15 @@
#include "base/big_endian.h"
#include "base/bind.h"
#include "base/compiler_specific.h"
+#include "base/location.h"
#include "base/memory/ref_counted.h"
#include "base/memory/weak_ptr.h"
-#include "base/message_loop/message_loop.h"
#include "base/metrics/histogram.h"
#include "base/numerics/safe_conversions.h"
+#include "base/single_thread_task_runner.h"
#include "base/stl_util.h"
#include "base/strings/stringprintf.h"
+#include "base/thread_task_runner_handle.h"
#include "base/time/time.h"
#include "net/base/io_buffer.h"
#include "net/http/http_request_headers.h"
@@ -640,10 +642,9 @@
}
void WebSocketChannel::ScheduleOpeningHandshakeNotification() {
- base::MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(HandshakeNotificationSender::Send,
- notification_sender_->AsWeakPtr()));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
+ FROM_HERE, base::Bind(HandshakeNotificationSender::Send,
+ notification_sender_->AsWeakPtr()));
}
ChannelState WebSocketChannel::WriteFrames() {
diff --git a/net/websockets/websocket_channel_test.cc b/net/websockets/websocket_channel_test.cc
index c659685..032123e 100644
--- a/net/websockets/websocket_channel_test.cc
+++ b/net/websockets/websocket_channel_test.cc
@@ -19,7 +19,9 @@
#include "base/memory/scoped_vector.h"
#include "base/memory/weak_ptr.h"
#include "base/message_loop/message_loop.h"
+#include "base/single_thread_task_runner.h"
#include "base/strings/string_piece.h"
+#include "base/thread_task_runner_handle.h"
#include "net/base/net_errors.h"
#include "net/base/test_completion_callback.h"
#include "net/http/http_response_headers.h"
@@ -484,12 +486,9 @@
return ERR_IO_PENDING;
if (responses_[index_]->async == ASYNC) {
read_frames_pending_ = true;
- base::MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(&ReadableFakeWebSocketStream::DoCallback,
- base::Unretained(this),
- frames,
- callback));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
+ FROM_HERE, base::Bind(&ReadableFakeWebSocketStream::DoCallback,
+ base::Unretained(this), frames, callback));
return ERR_IO_PENDING;
} else {
frames->swap(responses_[index_]->frames);
@@ -580,10 +579,9 @@
private:
void PostCallback() {
- base::MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(&EchoeyFakeWebSocketStream::DoCallback,
- base::Unretained(this)));
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
+ FROM_HERE, base::Bind(&EchoeyFakeWebSocketStream::DoCallback,
+ base::Unretained(this)));
}
void DoCallback() {
@@ -634,17 +632,15 @@
int WriteFrames(ScopedVector<WebSocketFrame>* frames,
const CompletionCallback& callback) override {
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(&ResetOnWriteFakeWebSocketStream::CallCallbackUnlessClosed,
- weak_ptr_factory_.GetWeakPtr(),
- callback,
+ weak_ptr_factory_.GetWeakPtr(), callback,
ERR_CONNECTION_RESET));
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE,
base::Bind(&ResetOnWriteFakeWebSocketStream::CallCallbackUnlessClosed,
- weak_ptr_factory_.GetWeakPtr(),
- read_callback_,
+ weak_ptr_factory_.GetWeakPtr(), read_callback_,
ERR_CONNECTION_RESET));
return ERR_IO_PENDING;
}
diff --git a/net/websockets/websocket_end_to_end_test.cc b/net/websockets/websocket_end_to_end_test.cc
index 9dc6c54..a5cf6b4 100644
--- a/net/websockets/websocket_end_to_end_test.cc
+++ b/net/websockets/websocket_end_to_end_test.cc
@@ -13,10 +13,12 @@
#include "base/bind.h"
#include "base/bind_helpers.h"
#include "base/callback.h"
+#include "base/location.h"
#include "base/memory/scoped_ptr.h"
-#include "base/message_loop/message_loop.h"
#include "base/run_loop.h"
+#include "base/single_thread_task_runner.h"
#include "base/strings/string_piece.h"
+#include "base/thread_task_runner_handle.h"
#include "net/base/auth.h"
#include "net/base/network_delegate.h"
#include "net/base/test_data_directory.h"
@@ -177,7 +179,7 @@
const GURL& url,
const SSLInfo& ssl_info,
bool fatal) {
- base::MessageLoop::current()->PostTask(
+ base::ThreadTaskRunnerHandle::Get()->PostTask(
FROM_HERE, base::Bind(&SSLErrorCallbacks::CancelSSLRequest,
base::Owned(ssl_error_callbacks.release()),
ERR_SSL_PROTOCOL_ERROR, &ssl_info));
