diff options
Diffstat (limited to 'content')
11 files changed, 18 insertions, 17 deletions
diff --git a/content/browser/browser_main_loop.cc b/content/browser/browser_main_loop.cc index f04b342..27c791d 100644 --- a/content/browser/browser_main_loop.cc +++ b/content/browser/browser_main_loop.cc @@ -411,8 +411,8 @@ void BrowserMainLoop::MainMessageLoopStart() { scoped_ptr<base::win::TextServicesMessageFilter> tsf_message_filter( new base::win::TextServicesMessageFilter); if (tsf_message_filter->Init()) { - MessageLoopForUI::current()->SetMessageFilter( - tsf_message_filter.PassAs<MessageLoopForUI::MessageFilter>()); + base::MessageLoopForUI::current()->SetMessageFilter( + tsf_message_filter.PassAs<base::MessageLoopForUI::MessageFilter>()); } } #endif diff --git a/content/browser/browser_thread_impl.cc b/content/browser/browser_thread_impl.cc index 37f67bc..07b99a3f 100644 --- a/content/browser/browser_thread_impl.cc +++ b/content/browser/browser_thread_impl.cc @@ -457,7 +457,7 @@ BrowserThread::GetMessageLoopProxyForThread(ID identifier) { } // static -MessageLoop* BrowserThread::UnsafeGetMessageLoopForThread(ID identifier) { +base::MessageLoop* BrowserThread::UnsafeGetMessageLoopForThread(ID identifier) { if (g_globals == NULL) return NULL; diff --git a/content/browser/gpu/browser_gpu_channel_host_factory.cc b/content/browser/gpu/browser_gpu_channel_host_factory.cc index 7cef1f0..a5055b6 100644 --- a/content/browser/gpu/browser_gpu_channel_host_factory.cc +++ b/content/browser/gpu/browser_gpu_channel_host_factory.cc @@ -66,7 +66,7 @@ bool BrowserGpuChannelHostFactory::IsIOThread() { return BrowserThread::CurrentlyOn(BrowserThread::IO); } -MessageLoop* BrowserGpuChannelHostFactory::GetMainLoop() { +base::MessageLoop* BrowserGpuChannelHostFactory::GetMainLoop() { return BrowserThread::UnsafeGetMessageLoopForThread(BrowserThread::UI); } diff --git a/content/browser/loader/resource_dispatcher_host_unittest.cc b/content/browser/loader/resource_dispatcher_host_unittest.cc index 0341935..0f887ea9 100644 --- a/content/browser/loader/resource_dispatcher_host_unittest.cc +++ b/content/browser/loader/resource_dispatcher_host_unittest.cc @@ -1409,7 +1409,7 @@ TEST_F(ResourceDispatcherHostTest, TooManyOutstandingRequests) { // Flush all the pending requests. while (net::URLRequestTestJob::ProcessOnePendingMessage()) {} - MessageLoop::current()->RunUntilIdle(); + base::MessageLoop::current()->RunUntilIdle(); // Sorts out all the messages we saw by request. ResourceIPCAccumulator::ClassifiedMessages msgs; diff --git a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc index abd600b..ceefb98 100644 --- a/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc +++ b/content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc @@ -142,7 +142,7 @@ class MediaStreamDispatcherHostTest : public testing::Test { protected: virtual void SetUp() OVERRIDE { // MediaStreamManager must be created and called on IO thread. - message_loop_.reset(new MessageLoop(base::MessageLoop::TYPE_IO)); + message_loop_.reset(new base::MessageLoop(base::MessageLoop::TYPE_IO)); ui_thread_.reset(new TestBrowserThread(BrowserThread::UI, message_loop_.get())); io_thread_.reset(new TestBrowserThread(BrowserThread::IO, diff --git a/content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc b/content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc index b352c9f..f64a922 100644 --- a/content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc +++ b/content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc @@ -339,7 +339,7 @@ TEST_F(P2PSocketHostStunTcpTest, SendDataNoAuth) { // Verify that asynchronous writes are handled correctly. TEST_F(P2PSocketHostStunTcpTest, AsyncWrites) { - MessageLoop message_loop; + base::MessageLoop message_loop; socket_->set_async_write(true); diff --git a/content/browser/renderer_host/render_widget_host_view_browsertest.cc b/content/browser/renderer_host/render_widget_host_view_browsertest.cc index 33bd1ca..4a6de28 100644 --- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc +++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc @@ -170,7 +170,7 @@ class RenderWidgetHostViewBrowserTest : public ContentBrowserTest { // call stack. static void GiveItSomeTime() { base::RunLoop run_loop; - MessageLoop::current()->PostDelayedTask( + base::MessageLoop::current()->PostDelayedTask( FROM_HERE, run_loop.QuitClosure(), base::TimeDelta::FromMilliseconds(10)); diff --git a/content/browser/renderer_host/smooth_scroll_gesture_controller_unittest.cc b/content/browser/renderer_host/smooth_scroll_gesture_controller_unittest.cc index 96b70a2..3808983 100644 --- a/content/browser/renderer_host/smooth_scroll_gesture_controller_unittest.cc +++ b/content/browser/renderer_host/smooth_scroll_gesture_controller_unittest.cc @@ -123,20 +123,20 @@ class SmoothScrollGestureControllerTest : public testing::Test { #endif // Process all pending tasks to avoid leaks. - MessageLoop::current()->RunUntilIdle(); + base::MessageLoop::current()->RunUntilIdle(); } void PostQuitMessageAndRun() { // Allow the message loop to process pending synthetic scrolls, then quit. - MessageLoop::current()->PostDelayedTask( - FROM_HERE, MessageLoop::QuitClosure(), + base::MessageLoop::current()->PostDelayedTask( + FROM_HERE, base::MessageLoop::QuitClosure(), TimeDelta::FromMilliseconds( controller_.GetSyntheticScrollMessageInterval().InMilliseconds() * 3)); - MessageLoop::current()->Run(); + base::MessageLoop::current()->Run(); } - MessageLoopForUI message_loop_; + base::MessageLoopForUI message_loop_; scoped_ptr<TestBrowserContext> browser_context_; MockRenderProcessHost* process_; // Deleted automatically by the widget. diff --git a/content/public/renderer/content_renderer_client.cc b/content/public/renderer/content_renderer_client.cc index 449451f..3440b65 100644 --- a/content/public/renderer/content_renderer_client.cc +++ b/content/public/renderer/content_renderer_client.cc @@ -160,7 +160,8 @@ bool ContentRendererClient::AllowBrowserPlugin( return false; } -MessageLoop* ContentRendererClient::OverrideCompositorMessageLoop() const { +base::MessageLoop* ContentRendererClient::OverrideCompositorMessageLoop() + const { return NULL; } diff --git a/content/public/test/mock_render_thread.cc b/content/public/test/mock_render_thread.cc index c680760..ec75926 100644 --- a/content/public/test/mock_render_thread.cc +++ b/content/public/test/mock_render_thread.cc @@ -56,7 +56,7 @@ bool MockRenderThread::Send(IPC::Message* msg) { return true; } -MessageLoop* MockRenderThread::GetMessageLoop() { +base::MessageLoop* MockRenderThread::GetMessageLoop() { return NULL; } diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc index 9783efb..d39d64d 100644 --- a/content/renderer/render_thread_impl.cc +++ b/content/renderer/render_thread_impl.cc @@ -547,7 +547,7 @@ bool RenderThreadImpl::Send(IPC::Message* msg) { return rv; } -MessageLoop* RenderThreadImpl::GetMessageLoop() { +base::MessageLoop* RenderThreadImpl::GetMessageLoop() { return message_loop(); } @@ -1084,7 +1084,7 @@ bool RenderThreadImpl::IsIOThread() { ChildProcess::current()->io_message_loop(); } -MessageLoop* RenderThreadImpl::GetMainLoop() { +base::MessageLoop* RenderThreadImpl::GetMainLoop() { return message_loop(); } |