diff options
Diffstat (limited to 'webkit')
5 files changed, 13 insertions, 13 deletions
diff --git a/webkit/browser/blob/blob_storage_context_unittest.cc b/webkit/browser/blob/blob_storage_context_unittest.cc index e462b95..ef24bdc 100644 --- a/webkit/browser/blob/blob_storage_context_unittest.cc +++ b/webkit/browser/blob/blob_storage_context_unittest.cc @@ -28,7 +28,7 @@ void SetupBasicBlob(BlobStorageHost* host, const std::string& id) { TEST(BlobStorageContextTest, IncrementDecrementRef) { BlobStorageContext context; BlobStorageHost host(&context); - MessageLoop fake_io_message_loop; + base::MessageLoop fake_io_message_loop; // Build up a basic blob. const std::string kId("id"); @@ -58,7 +58,7 @@ TEST(BlobStorageContextTest, IncrementDecrementRef) { TEST(BlobStorageContextTest, BlobDataHandle) { BlobStorageContext context; BlobStorageHost host(&context); - MessageLoop fake_io_message_loop; + base::MessageLoop fake_io_message_loop; // Build up a basic blob. const std::string kId("id"); @@ -89,7 +89,7 @@ TEST(BlobStorageContextTest, CompoundBlobs) { const std::string kId2("id2"); const std::string kId2Prime("id2.prime"); - MessageLoop fake_io_message_loop; + base::MessageLoop fake_io_message_loop; // Setup a set of blob data for testing. base::Time time1, time2; @@ -134,7 +134,7 @@ TEST(BlobStorageContextTest, CompoundBlobs) { TEST(BlobStorageContextTest, PublicBlobUrls) { BlobStorageContext context; BlobStorageHost host(&context); - MessageLoop fake_io_message_loop; + base::MessageLoop fake_io_message_loop; // Build up a basic blob. const std::string kId("id"); @@ -166,7 +166,7 @@ TEST(BlobStorageContextTest, PublicBlobUrls) { TEST(BlobStorageContextTest, HostCleanup) { BlobStorageContext context; scoped_ptr<BlobStorageHost> host(new BlobStorageHost(&context)); - MessageLoop fake_io_message_loop; + base::MessageLoop fake_io_message_loop; // Build up a basic blob and register a url const std::string kId("id"); @@ -185,7 +185,7 @@ TEST(BlobStorageContextTest, HostCleanup) { TEST(BlobStorageContextTest, EarlyContextDeletion) { scoped_ptr<BlobStorageContext> context(new BlobStorageContext); BlobStorageHost host(context.get()); - MessageLoop fake_io_message_loop; + base::MessageLoop fake_io_message_loop; // Deleting the context should not induce crashes. context.reset(); diff --git a/webkit/browser/fileapi/transient_file_util_unittest.cc b/webkit/browser/fileapi/transient_file_util_unittest.cc index 69d2c0a..58a8046 100644 --- a/webkit/browser/fileapi/transient_file_util_unittest.cc +++ b/webkit/browser/fileapi/transient_file_util_unittest.cc @@ -34,7 +34,7 @@ class TransientFileUtilTest : public testing::Test { virtual void TearDown() OVERRIDE { file_system_context_ = NULL; - MessageLoop::current()->RunUntilIdle(); + base::MessageLoop::current()->RunUntilIdle(); } void CreateAndRegisterTemporaryFile( @@ -65,7 +65,7 @@ class TransientFileUtilTest : public testing::Test { FileSystemFileUtil* file_util() { return transient_file_util_.get(); } private: - MessageLoop message_loop_; + base::MessageLoop message_loop_; base::ScopedTempDir data_dir_; scoped_refptr<FileSystemContext> file_system_context_; scoped_ptr<TransientFileUtil> transient_file_util_; @@ -110,7 +110,7 @@ TEST_F(TransientFileUtilTest, TransientFile) { } // The file's now scoped out. - MessageLoop::current()->RunUntilIdle(); + base::MessageLoop::current()->RunUntilIdle(); // Now the temporary file and the transient filesystem must be gone too. ASSERT_FALSE(file_util::PathExists(temp_path)); 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. |