summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell/simple_socket_stream_bridge.cc
diff options
context:
space:
mode:
authorxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-07 12:43:32 +0000
committerxhwang@chromium.org <xhwang@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-05-07 12:43:32 +0000
commit4cc586b1495a87a0c47cdd90d63e4211e6f5b830 (patch)
treeb939ab56c815f48cca899f8bce7488e371bf2784 /webkit/tools/test_shell/simple_socket_stream_bridge.cc
parent8b8809ee49a63333d58c3d009d89508cb8dddce8 (diff)
downloadchromium_src-4cc586b1495a87a0c47cdd90d63e4211e6f5b830.zip
chromium_src-4cc586b1495a87a0c47cdd90d63e4211e6f5b830.tar.gz
chromium_src-4cc586b1495a87a0c47cdd90d63e4211e6f5b830.tar.bz2
webkit: Use base::MessageLoop.
BUG=236029 R=brettw@chromium.org Review URL: https://chromiumcodereview.appspot.com/14520026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@198691 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit/tools/test_shell/simple_socket_stream_bridge.cc')
-rw-r--r--webkit/tools/test_shell/simple_socket_stream_bridge.cc20
1 files changed, 10 insertions, 10 deletions
diff --git a/webkit/tools/test_shell/simple_socket_stream_bridge.cc b/webkit/tools/test_shell/simple_socket_stream_bridge.cc
index f43c87b..0367a18 100644
--- a/webkit/tools/test_shell/simple_socket_stream_bridge.cc
+++ b/webkit/tools/test_shell/simple_socket_stream_bridge.cc
@@ -67,7 +67,7 @@ class WebSocketStreamHandleBridgeImpl
void DoOnError(int error_code, const char* error_msg);
int socket_id_;
- MessageLoop* message_loop_;
+ base::MessageLoop* message_loop_;
WebKit::WebSocketStreamHandle* handle_;
webkit_glue::WebSocketStreamHandleDelegate* delegate_;
@@ -82,7 +82,7 @@ WebSocketStreamHandleBridgeImpl::WebSocketStreamHandleBridgeImpl(
WebKit::WebSocketStreamHandle* handle,
webkit_glue::WebSocketStreamHandleDelegate* delegate)
: socket_id_(kNoSocketId),
- message_loop_(MessageLoop::current()),
+ message_loop_(base::MessageLoop::current()),
handle_(handle),
delegate_(delegate),
num_pending_tasks_(0) {
@@ -167,7 +167,7 @@ void WebSocketStreamHandleBridgeImpl::OnError(
}
void WebSocketStreamHandleBridgeImpl::DoConnect(const GURL& url) {
- DCHECK(MessageLoop::current() == g_io_thread);
+ DCHECK(base::MessageLoop::current() == g_io_thread);
socket_ = net::SocketStreamJob::CreateSocketStreamJob(
url, this, g_request_context->transport_security_state(),
g_request_context->ssl_config_service());
@@ -176,7 +176,7 @@ void WebSocketStreamHandleBridgeImpl::DoConnect(const GURL& url) {
}
void WebSocketStreamHandleBridgeImpl::DoSend(std::vector<char>* data) {
- DCHECK(MessageLoop::current() == g_io_thread);
+ DCHECK(base::MessageLoop::current() == g_io_thread);
scoped_ptr<std::vector<char> > scoped_data(data);
if (!socket_)
return;
@@ -185,7 +185,7 @@ void WebSocketStreamHandleBridgeImpl::DoSend(std::vector<char>* data) {
}
void WebSocketStreamHandleBridgeImpl::DoClose() {
- DCHECK(MessageLoop::current() == g_io_thread);
+ DCHECK(base::MessageLoop::current() == g_io_thread);
if (!socket_)
return;
socket_->Close();
@@ -193,14 +193,14 @@ void WebSocketStreamHandleBridgeImpl::DoClose() {
void WebSocketStreamHandleBridgeImpl::DoOnConnected(
int max_pending_send_allowed) {
- DCHECK(MessageLoop::current() == message_loop_);
+ DCHECK(base::MessageLoop::current() == message_loop_);
base::subtle::NoBarrier_AtomicIncrement(&num_pending_tasks_, -1);
if (delegate_)
delegate_->DidOpenStream(handle_, max_pending_send_allowed);
}
void WebSocketStreamHandleBridgeImpl::DoOnSentData(int amount_sent) {
- DCHECK(MessageLoop::current() == message_loop_);
+ DCHECK(base::MessageLoop::current() == message_loop_);
base::subtle::NoBarrier_AtomicIncrement(&num_pending_tasks_, -1);
if (delegate_)
delegate_->DidSendData(handle_, amount_sent);
@@ -208,7 +208,7 @@ void WebSocketStreamHandleBridgeImpl::DoOnSentData(int amount_sent) {
void WebSocketStreamHandleBridgeImpl::DoOnReceivedData(
std::vector<char>* data) {
- DCHECK(MessageLoop::current() == message_loop_);
+ DCHECK(base::MessageLoop::current() == message_loop_);
base::subtle::NoBarrier_AtomicIncrement(&num_pending_tasks_, -1);
scoped_ptr<std::vector<char> > scoped_data(data);
if (delegate_)
@@ -216,7 +216,7 @@ void WebSocketStreamHandleBridgeImpl::DoOnReceivedData(
}
void WebSocketStreamHandleBridgeImpl::DoOnClose() {
- DCHECK(MessageLoop::current() == message_loop_);
+ DCHECK(base::MessageLoop::current() == message_loop_);
base::subtle::NoBarrier_AtomicIncrement(&num_pending_tasks_, -1);
// Don't handle OnClose if there are pending tasks.
DCHECK_EQ(num_pending_tasks_, 0);
@@ -242,7 +242,7 @@ void WebSocketStreamHandleBridgeImpl::DoOnError(
/* static */
void SimpleSocketStreamBridge::InitializeOnIOThread(
net::URLRequestContext* request_context) {
- g_io_thread = MessageLoop::current();
+ g_io_thread = base::MessageLoop::current();
g_request_context = request_context;
}