summaryrefslogtreecommitdiffstats
path: root/webkit/tools/test_shell
diff options
context:
space:
mode:
Diffstat (limited to 'webkit/tools/test_shell')
-rw-r--r--webkit/tools/test_shell/simple_file_system.cc2
-rw-r--r--webkit/tools/test_shell/simple_socket_stream_bridge.cc4
-rw-r--r--webkit/tools/test_shell/test_shell_webblobregistry_impl.cc2
3 files changed, 4 insertions, 4 deletions
diff --git a/webkit/tools/test_shell/simple_file_system.cc b/webkit/tools/test_shell/simple_file_system.cc
index 75cbd72..94310dc 100644
--- a/webkit/tools/test_shell/simple_file_system.cc
+++ b/webkit/tools/test_shell/simple_file_system.cc
@@ -51,7 +51,7 @@ using fileapi::FileSystemTaskRunners;
using fileapi::FileSystemURL;
namespace {
-MessageLoop* g_io_thread;
+base::MessageLoop* g_io_thread;
webkit_blob::BlobStorageController* g_blob_storage_controller;
void RegisterBlob(const GURL& blob_url, const base::FilePath& file_path) {
diff --git a/webkit/tools/test_shell/simple_socket_stream_bridge.cc b/webkit/tools/test_shell/simple_socket_stream_bridge.cc
index 85bdc06..50723f0 100644
--- a/webkit/tools/test_shell/simple_socket_stream_bridge.cc
+++ b/webkit/tools/test_shell/simple_socket_stream_bridge.cc
@@ -25,7 +25,7 @@ const int kNoSocketId = 0;
namespace {
-MessageLoop* g_io_thread;
+base::MessageLoop* g_io_thread;
net::URLRequestContext* g_request_context;
class WebSocketStreamHandleBridgeImpl
@@ -231,7 +231,7 @@ void WebSocketStreamHandleBridgeImpl::DoOnClose() {
void WebSocketStreamHandleBridgeImpl::DoOnError(
int error_code, const char* error_msg) {
- DCHECK(MessageLoop::current() == message_loop_);
+ DCHECK(base::MessageLoop::current() == message_loop_);
base::subtle::NoBarrier_AtomicIncrement(&num_pending_tasks_, -1);
if (delegate_)
delegate_->DidFail(handle_, error_code, ASCIIToUTF16(error_msg));
diff --git a/webkit/tools/test_shell/test_shell_webblobregistry_impl.cc b/webkit/tools/test_shell/test_shell_webblobregistry_impl.cc
index 3374dac..6352656 100644
--- a/webkit/tools/test_shell/test_shell_webblobregistry_impl.cc
+++ b/webkit/tools/test_shell/test_shell_webblobregistry_impl.cc
@@ -19,7 +19,7 @@ using webkit_blob::BlobData;
namespace {
-MessageLoop* g_io_thread;
+base::MessageLoop* g_io_thread;
webkit_blob::BlobStorageController* g_blob_storage_controller;
// Creates a new BlobData from WebBlobData.