diff options
Diffstat (limited to 'content/browser/renderer_host')
20 files changed, 147 insertions, 142 deletions
diff --git a/content/browser/renderer_host/compositor_impl_android.cc b/content/browser/renderer_host/compositor_impl_android.cc index ce153f5..4a12052 100644 --- a/content/browser/renderer_host/compositor_impl_android.cc +++ b/content/browser/renderer_host/compositor_impl_android.cc @@ -82,7 +82,7 @@ class OutputSurfaceWithoutParent : public cc::OutputSurface { capabilities_.adjust_deadline_for_parent = false; capabilities_.max_frames_pending = 2; compositor_impl_ = compositor_impl; - main_thread_ = base::MessageLoopProxy::current(); + main_thread_ = base::ThreadTaskRunnerHandle::Get(); } void SwapBuffers(cc::CompositorFrame* frame) override { @@ -130,7 +130,7 @@ class OutputSurfaceWithoutParent : public cc::OutputSurface { gfx::SwapResult)> swap_buffers_completion_callback_; - scoped_refptr<base::MessageLoopProxy> main_thread_; + scoped_refptr<base::SingleThreadTaskRunner> main_thread_; base::WeakPtr<CompositorImpl> compositor_impl_; }; @@ -307,7 +307,7 @@ void CompositorImpl::PostComposite(CompositingTrigger trigger) { // Unretained because we cancel the task on shutdown. current_composite_task_.reset(new base::CancelableClosure( base::Bind(&CompositorImpl::Composite, base::Unretained(this), trigger))); - base::MessageLoop::current()->PostDelayedTask( + base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( FROM_HERE, current_composite_task_->callback(), delay); } @@ -657,7 +657,7 @@ void CompositorImpl::CreateOutputSurface() { real_output_surface.Pass(), manager, HostSharedBitmapManager::current(), BrowserGpuMemoryBufferManager::current(), host_->settings().renderer_settings, - base::MessageLoopProxy::current())); + base::ThreadTaskRunnerHandle::Get())); scoped_ptr<cc::SurfaceDisplayOutputSurface> surface_output_surface( new cc::SurfaceDisplayOutputSurface( manager, surface_id_allocator_.get(), context_provider)); diff --git a/content/browser/renderer_host/input/gesture_event_queue_unittest.cc b/content/browser/renderer_host/input/gesture_event_queue_unittest.cc index 3e57cd0..7e7a6ea 100644 --- a/content/browser/renderer_host/input/gesture_event_queue_unittest.cc +++ b/content/browser/renderer_host/input/gesture_event_queue_unittest.cc @@ -5,9 +5,12 @@ #include <vector> #include "base/basictypes.h" +#include "base/location.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" +#include "base/single_thread_task_runner.h" +#include "base/thread_task_runner_handle.h" #include "base/time/time.h" #include "content/browser/renderer_host/input/gesture_event_queue.h" #include "content/browser/renderer_host/input/touchpad_tap_suppression_controller.h" @@ -1083,9 +1086,8 @@ TEST_F(GestureEventQueueTest, DebounceDefersFollowingGestureEvents) { EXPECT_EQ(2U, GestureEventQueueSize()); EXPECT_EQ(3U, GestureEventDebouncingQueueSize()); - base::MessageLoop::current()->PostDelayedTask( - FROM_HERE, - base::MessageLoop::QuitClosure(), + base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( + FROM_HERE, base::MessageLoop::QuitClosure(), TimeDelta::FromMilliseconds(5)); base::MessageLoop::current()->Run(); diff --git a/content/browser/renderer_host/input/input_router_impl_unittest.cc b/content/browser/renderer_host/input/input_router_impl_unittest.cc index 918c260..4f2e6bb 100644 --- a/content/browser/renderer_host/input/input_router_impl_unittest.cc +++ b/content/browser/renderer_host/input/input_router_impl_unittest.cc @@ -6,8 +6,11 @@ #include "base/basictypes.h" #include "base/command_line.h" +#include "base/location.h" #include "base/memory/scoped_ptr.h" +#include "base/single_thread_task_runner.h" #include "base/strings/utf_string_conversions.h" +#include "base/thread_task_runner_handle.h" #include "content/browser/renderer_host/input/gesture_event_queue.h" #include "content/browser/renderer_host/input/input_router_client.h" #include "content/browser/renderer_host/input/input_router_impl.h" @@ -326,7 +329,7 @@ class InputRouterImplTest : public testing::Test { } static void RunTasksAndWait(base::TimeDelta delay) { - base::MessageLoop::current()->PostDelayedTask( + base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( FROM_HERE, base::MessageLoop::QuitClosure(), delay); base::MessageLoop::current()->Run(); } diff --git a/content/browser/renderer_host/input/touch_event_queue_unittest.cc b/content/browser/renderer_host/input/touch_event_queue_unittest.cc index 2467cde..f46fe50 100644 --- a/content/browser/renderer_host/input/touch_event_queue_unittest.cc +++ b/content/browser/renderer_host/input/touch_event_queue_unittest.cc @@ -3,9 +3,12 @@ // found in the LICENSE file. #include "base/basictypes.h" +#include "base/location.h" #include "base/logging.h" #include "base/memory/scoped_ptr.h" #include "base/message_loop/message_loop.h" +#include "base/single_thread_task_runner.h" +#include "base/thread_task_runner_handle.h" #include "content/browser/renderer_host/input/timeout_monitor.h" #include "content/browser/renderer_host/input/touch_event_queue.h" #include "content/common/input/synthetic_web_input_event_builders.h" @@ -282,7 +285,7 @@ class TouchEventQueueTest : public testing::Test, } static void RunTasksAndWait(base::TimeDelta delay) { - base::MessageLoop::current()->PostDelayedTask( + base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( FROM_HERE, base::MessageLoop::QuitClosure(), delay); base::MessageLoop::current()->Run(); } diff --git a/content/browser/renderer_host/input/touch_input_browsertest.cc b/content/browser/renderer_host/input/touch_input_browsertest.cc index b6d5f99..9c9bcef 100644 --- a/content/browser/renderer_host/input/touch_input_browsertest.cc +++ b/content/browser/renderer_host/input/touch_input_browsertest.cc @@ -4,7 +4,10 @@ #include "base/auto_reset.h" #include "base/command_line.h" +#include "base/location.h" #include "base/run_loop.h" +#include "base/single_thread_task_runner.h" +#include "base/thread_task_runner_handle.h" #include "content/browser/gpu/compositor_util.h" #include "content/browser/renderer_host/render_widget_host_impl.h" #include "content/browser/web_contents/web_contents_impl.h" @@ -27,10 +30,8 @@ namespace { void GiveItSomeTime() { base::RunLoop run_loop; - base::MessageLoop::current()->PostDelayedTask( - FROM_HERE, - run_loop.QuitClosure(), - base::TimeDelta::FromMilliseconds(10)); + base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( + FROM_HERE, run_loop.QuitClosure(), base::TimeDelta::FromMilliseconds(10)); run_loop.Run(); } diff --git a/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc b/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc index f6a5fb2..498806b 100644 --- a/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc +++ b/content/browser/renderer_host/media/audio_input_device_manager_unittest.cc @@ -5,9 +5,10 @@ #include <string> #include "base/bind.h" +#include "base/location.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop/message_loop.h" +#include "base/single_thread_task_runner.h" #include "base/synchronization/waitable_event.h" #include "content/browser/browser_thread_impl.h" #include "content/browser/renderer_host/media/audio_input_device_manager.h" @@ -71,7 +72,7 @@ class MAYBE_AudioInputDeviceManagerTest : public testing::Test { manager_->UseFakeDevice(); audio_input_listener_.reset(new MockAudioInputDeviceManagerListener()); manager_->Register(audio_input_listener_.get(), - message_loop_->message_loop_proxy().get()); + message_loop_->task_runner().get()); // Gets the enumerated device list from the AudioInputDeviceManager. manager_->EnumerateDevices(MEDIA_DEVICE_AUDIO_CAPTURE); 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 848f78c4..19fb35e 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 @@ -2,14 +2,16 @@ // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. -#include <string> #include <queue> +#include <string> #include "base/bind.h" #include "base/callback_helpers.h" #include "base/command_line.h" -#include "base/message_loop/message_loop.h" +#include "base/location.h" #include "base/run_loop.h" +#include "base/single_thread_task_runner.h" +#include "base/thread_task_runner_handle.h" #include "content/browser/browser_thread_impl.h" #include "content/browser/renderer_host/media/audio_input_device_manager.h" #include "content/browser/renderer_host/media/media_stream_dispatcher_host.h" @@ -55,10 +57,10 @@ class MockMediaStreamDispatcherHost : public MediaStreamDispatcherHost, public: MockMediaStreamDispatcherHost( const ResourceContext::SaltCallback salt_callback, - const scoped_refptr<base::MessageLoopProxy>& message_loop, + const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, MediaStreamManager* manager) : MediaStreamDispatcherHost(kProcessId, salt_callback, manager), - message_loop_(message_loop), + task_runner_(task_runner), current_ipc_(NULL) {} // A list of mock methods. @@ -155,7 +157,7 @@ class MockMediaStreamDispatcherHost : public MediaStreamDispatcherHost, // Notify that the event have occurred. base::Closure quit_closure = quit_closures_.front(); quit_closures_.pop(); - message_loop_->PostTask(FROM_HERE, base::ResetAndReturn(&quit_closure)); + task_runner_->PostTask(FROM_HERE, base::ResetAndReturn(&quit_closure)); label_ = label; audio_devices_ = audio_device_list; @@ -169,7 +171,7 @@ class MockMediaStreamDispatcherHost : public MediaStreamDispatcherHost, if (!quit_closures_.empty()) { base::Closure quit_closure = quit_closures_.front(); quit_closures_.pop(); - message_loop_->PostTask(FROM_HERE, base::ResetAndReturn(&quit_closure)); + task_runner_->PostTask(FROM_HERE, base::ResetAndReturn(&quit_closure)); } label_= ""; @@ -190,7 +192,7 @@ class MockMediaStreamDispatcherHost : public MediaStreamDispatcherHost, const StreamDeviceInfo& device) { base::Closure quit_closure = quit_closures_.front(); quit_closures_.pop(); - message_loop_->PostTask(FROM_HERE, base::ResetAndReturn(&quit_closure)); + task_runner_->PostTask(FROM_HERE, base::ResetAndReturn(&quit_closure)); label_ = label; opened_device_ = device; } @@ -199,11 +201,11 @@ class MockMediaStreamDispatcherHost : public MediaStreamDispatcherHost, const StreamDeviceInfoArray& devices) { base::Closure quit_closure = quit_closures_.front(); quit_closures_.pop(); - message_loop_->PostTask(FROM_HERE, base::ResetAndReturn(&quit_closure)); + task_runner_->PostTask(FROM_HERE, base::ResetAndReturn(&quit_closure)); enumerated_devices_ = devices; } - scoped_refptr<base::MessageLoopProxy> message_loop_; + scoped_refptr<base::SingleThreadTaskRunner> task_runner_; IPC::Message* current_ipc_; std::queue<base::Closure> quit_closures_; }; @@ -223,7 +225,7 @@ class MediaStreamDispatcherHostTest : public testing::Test { thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP), origin_("https://test.com") { audio_manager_.reset( - new media::MockAudioManager(base::MessageLoopProxy::current())); + new media::MockAudioManager(base::ThreadTaskRunnerHandle::Get())); // Make sure we use fake devices to avoid long delays. base::CommandLine::ForCurrentProcess()->AppendSwitch( switches::kUseFakeDeviceForMediaStream); @@ -237,7 +239,7 @@ class MediaStreamDispatcherHostTest : public testing::Test { #if defined(OS_WIN) // Override the Video Capture Thread that MediaStreamManager constructs. media_stream_manager_->video_capture_manager()->set_device_task_runner( - base::MessageLoopProxy::current()); + base::ThreadTaskRunnerHandle::Get()); #endif MockResourceContext* mock_resource_context = @@ -246,8 +248,7 @@ class MediaStreamDispatcherHostTest : public testing::Test { host_ = new MockMediaStreamDispatcherHost( mock_resource_context->GetMediaDeviceIDSalt(), - base::MessageLoopProxy::current(), - media_stream_manager_.get()); + base::ThreadTaskRunnerHandle::Get(), media_stream_manager_.get()); // Use the fake content client and browser. content_client_.reset(new TestContentClient()); diff --git a/content/browser/renderer_host/media/media_stream_manager.cc b/content/browser/renderer_host/media/media_stream_manager.cc index 1ae9fe5..9c7ac2b 100644 --- a/content/browser/renderer_host/media/media_stream_manager.cc +++ b/content/browser/renderer_host/media/media_stream_manager.cc @@ -1670,8 +1670,7 @@ void MediaStreamManager::InitializeDeviceManagersOnIOThread() { // buggy third party Direct Show modules, http://crbug.com/428958. video_capture_thread_.init_com_with_mta(false); CHECK(video_capture_thread_.Start()); - video_capture_manager_->Register(this, - video_capture_thread_.message_loop_proxy()); + video_capture_manager_->Register(this, video_capture_thread_.task_runner()); #else video_capture_manager_->Register(this, device_task_runner_); #endif diff --git a/content/browser/renderer_host/media/media_stream_manager_unittest.cc b/content/browser/renderer_host/media/media_stream_manager_unittest.cc index 51ab0a5..fc0028c 100644 --- a/content/browser/renderer_host/media/media_stream_manager_unittest.cc +++ b/content/browser/renderer_host/media/media_stream_manager_unittest.cc @@ -6,8 +6,10 @@ #include "base/bind.h" #include "base/command_line.h" -#include "base/message_loop/message_loop.h" +#include "base/location.h" #include "base/run_loop.h" +#include "base/single_thread_task_runner.h" +#include "base/thread_task_runner_handle.h" #include "content/browser/browser_thread_impl.h" #include "content/browser/renderer_host/media/media_stream_manager.h" #include "content/browser/renderer_host/media/media_stream_ui_proxy.h" @@ -77,7 +79,7 @@ class MediaStreamManagerTest : public ::testing::Test { public: MediaStreamManagerTest() : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP), - message_loop_(base::MessageLoopProxy::current()) { + task_runner_(base::ThreadTaskRunnerHandle::Get()) { // Create our own MediaStreamManager. Use fake devices to run on the bots. base::CommandLine::ForCurrentProcess()->AppendSwitch( switches::kUseFakeDeviceForMediaStream); @@ -93,7 +95,7 @@ class MediaStreamManagerTest : public ::testing::Test { const MediaStreamDevices& devices, scoped_ptr<MediaStreamUIProxy> ui_proxy) { Response(index); - message_loop_->PostTask(FROM_HERE, run_loop_.QuitClosure()); + task_runner_->PostTask(FROM_HERE, run_loop_.QuitClosure()); } protected: @@ -117,7 +119,7 @@ class MediaStreamManagerTest : public ::testing::Test { scoped_ptr<media::AudioManager> audio_manager_; scoped_ptr<MediaStreamManager> media_stream_manager_; content::TestBrowserThreadBundle thread_bundle_; - scoped_refptr<base::MessageLoopProxy> message_loop_; + scoped_refptr<base::SingleThreadTaskRunner> task_runner_; base::RunLoop run_loop_; private: diff --git a/content/browser/renderer_host/media/video_capture_controller_unittest.cc b/content/browser/renderer_host/media/video_capture_controller_unittest.cc index 70cef13..d27fac3 100644 --- a/content/browser/renderer_host/media/video_capture_controller_unittest.cc +++ b/content/browser/renderer_host/media/video_capture_controller_unittest.cc @@ -8,10 +8,11 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/location.h" #include "base/memory/ref_counted.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/thread_task_runner_handle.h" #include "content/browser/renderer_host/media/media_stream_provider.h" #include "content/browser/renderer_host/media/video_capture_controller.h" @@ -73,14 +74,10 @@ class MockVideoCaptureControllerEventHandler const base::TimeTicks& timestamp, scoped_ptr<base::DictionaryValue> metadata) override { DoBufferReady(id, coded_size); - base::MessageLoop::current()->PostTask( + base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::Bind(&VideoCaptureController::ReturnBuffer, - base::Unretained(controller_), - id, - this, - buffer_id, - 0)); + base::Unretained(controller_), id, this, buffer_id, 0)); } void OnMailboxBufferReady( VideoCaptureControllerID id, @@ -90,19 +87,16 @@ class MockVideoCaptureControllerEventHandler const base::TimeTicks& timestamp, scoped_ptr<base::DictionaryValue> metadata) override { DoMailboxBufferReady(id); - base::MessageLoop::current()->PostTask( - FROM_HERE, - base::Bind(&VideoCaptureController::ReturnBuffer, - base::Unretained(controller_), - id, - this, - buffer_id, - mailbox_holder.sync_point)); + base::ThreadTaskRunnerHandle::Get()->PostTask( + FROM_HERE, base::Bind(&VideoCaptureController::ReturnBuffer, + base::Unretained(controller_), id, this, + buffer_id, mailbox_holder.sync_point)); } void OnEnded(VideoCaptureControllerID id) override { DoEnded(id); // OnEnded() must respond by (eventually) unregistering the client. - base::MessageLoop::current()->PostTask(FROM_HERE, + base::ThreadTaskRunnerHandle::Get()->PostTask( + FROM_HERE, base::Bind(base::IgnoreResult(&VideoCaptureController::RemoveClient), base::Unretained(controller_), id, this)); } diff --git a/content/browser/renderer_host/media/video_capture_host_unittest.cc b/content/browser/renderer_host/media/video_capture_host_unittest.cc index 763ed1f..878ea58 100644 --- a/content/browser/renderer_host/media/video_capture_host_unittest.cc +++ b/content/browser/renderer_host/media/video_capture_host_unittest.cc @@ -9,11 +9,13 @@ #include "base/command_line.h" #include "base/files/file_util.h" #include "base/files/scoped_file.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/stl_util.h" #include "base/strings/stringprintf.h" +#include "base/thread_task_runner_handle.h" #include "content/browser/browser_thread_impl.h" #include "content/browser/renderer_host/media/media_stream_manager.h" #include "content/browser/renderer_host/media/media_stream_requester.h" @@ -272,8 +274,8 @@ class MockVideoCaptureHost : public VideoCaptureHost { DumpVideo dumper_; }; -ACTION_P2(ExitMessageLoop, message_loop, quit_closure) { - message_loop->PostTask(FROM_HERE, quit_closure); +ACTION_P2(ExitMessageLoop, task_runner, quit_closure) { + task_runner->PostTask(FROM_HERE, quit_closure); } // This is an integration test of VideoCaptureHost in conjunction with @@ -283,7 +285,7 @@ class VideoCaptureHostTest : public testing::Test { public: VideoCaptureHostTest() : thread_bundle_(content::TestBrowserThreadBundle::IO_MAINLOOP), - message_loop_(base::MessageLoopProxy::current()), + task_runner_(base::ThreadTaskRunnerHandle::Get()), opened_session_id_(kInvalidMediaCaptureSessionId) {} void SetUp() override { @@ -349,13 +351,11 @@ class VideoCaptureHostTest : public testing::Test { page_request_id, MEDIA_DEVICE_VIDEO_CAPTURE, security_origin); - EXPECT_CALL(stream_requester_, DevicesEnumerated(render_frame_id, - page_request_id, - label, - _)) - .Times(1).WillOnce( - DoAll(ExitMessageLoop(message_loop_, run_loop.QuitClosure()), - SaveArg<3>(&devices))); + EXPECT_CALL(stream_requester_, + DevicesEnumerated(render_frame_id, page_request_id, label, _)) + .Times(1) + .WillOnce(DoAll(ExitMessageLoop(task_runner_, run_loop.QuitClosure()), + SaveArg<3>(&devices))); run_loop.Run(); Mock::VerifyAndClearExpectations(&stream_requester_); media_stream_manager_->CancelRequest(label); @@ -376,14 +376,12 @@ class VideoCaptureHostTest : public testing::Test { devices[0].device.id, MEDIA_DEVICE_VIDEO_CAPTURE, security_origin); - EXPECT_CALL(stream_requester_, DeviceOpened(render_frame_id, - page_request_id, - _, - _)) - .Times(1).WillOnce( - DoAll(ExitMessageLoop(message_loop_, run_loop.QuitClosure()), - SaveArg<2>(&opened_device_label_), - SaveArg<3>(&opened_device))); + EXPECT_CALL(stream_requester_, + DeviceOpened(render_frame_id, page_request_id, _, _)) + .Times(1) + .WillOnce(DoAll(ExitMessageLoop(task_runner_, run_loop.QuitClosure()), + SaveArg<2>(&opened_device_label_), + SaveArg<3>(&opened_device))); run_loop.Run(); Mock::VerifyAndClearExpectations(&stream_requester_); ASSERT_NE(StreamDeviceInfo::kNoId, opened_device.session_id); @@ -408,7 +406,7 @@ class VideoCaptureHostTest : public testing::Test { base::RunLoop run_loop; EXPECT_CALL(*host_.get(), OnBufferFilled(kDeviceId, _, _, _, _, _)) .Times(AnyNumber()) - .WillOnce(ExitMessageLoop(message_loop_, run_loop.QuitClosure())); + .WillOnce(ExitMessageLoop(task_runner_, run_loop.QuitClosure())); media::VideoCaptureParams params; params.requested_format = media::VideoCaptureFormat( @@ -457,7 +455,7 @@ class VideoCaptureHostTest : public testing::Test { base::RunLoop run_loop; EXPECT_CALL(*host_.get(), OnStateChanged(kDeviceId, VIDEO_CAPTURE_STATE_STOPPED)) - .WillOnce(ExitMessageLoop(message_loop_, run_loop.QuitClosure())); + .WillOnce(ExitMessageLoop(task_runner_, run_loop.QuitClosure())); host_->OnStopCapture(kDeviceId); host_->SetReturnReceivedDibs(true); @@ -474,7 +472,7 @@ class VideoCaptureHostTest : public testing::Test { base::RunLoop run_loop; EXPECT_CALL(*host_.get(), OnBufferFilled(kDeviceId, _, _, _, _, _)) .Times(AnyNumber()) - .WillOnce(ExitMessageLoop(message_loop_, run_loop.QuitClosure())) + .WillOnce(ExitMessageLoop(task_runner_, run_loop.QuitClosure())) .RetiresOnSaturation(); run_loop.Run(); } @@ -512,7 +510,7 @@ class VideoCaptureHostTest : public testing::Test { content::TestBrowserThreadBundle thread_bundle_; content::TestBrowserContext browser_context_; content::TestContentBrowserClient browser_client_; - scoped_refptr<base::MessageLoopProxy> message_loop_; + scoped_refptr<base::SingleThreadTaskRunner> task_runner_; int opened_session_id_; std::string opened_device_label_; diff --git a/content/browser/renderer_host/media/video_capture_manager.cc b/content/browser/renderer_host/media/video_capture_manager.cc index a213a56..2ee8396 100644 --- a/content/browser/renderer_host/media/video_capture_manager.cc +++ b/content/browser/renderer_host/media/video_capture_manager.cc @@ -9,11 +9,13 @@ #include "base/bind.h" #include "base/bind_helpers.h" +#include "base/location.h" #include "base/logging.h" -#include "base/message_loop/message_loop.h" #include "base/metrics/histogram_macros.h" +#include "base/single_thread_task_runner.h" #include "base/stl_util.h" #include "base/task_runner_util.h" +#include "base/thread_task_runner_handle.h" #include "base/threading/sequenced_worker_pool.h" #include "content/browser/media/capture/web_contents_video_capture_device.h" #include "content/browser/media/media_internals.h" @@ -224,9 +226,9 @@ int VideoCaptureManager::Open(const StreamDeviceInfo& device_info) { // Notify our listener asynchronously; this ensures that we return // |capture_session_id| to the caller of this function before using that same // id in a listener event. - base::MessageLoop::current()->PostTask(FROM_HERE, - base::Bind(&VideoCaptureManager::OnOpened, this, - device_info.device.type, capture_session_id)); + base::ThreadTaskRunnerHandle::Get()->PostTask( + FROM_HERE, base::Bind(&VideoCaptureManager::OnOpened, this, + device_info.device.type, capture_session_id)); return capture_session_id; } @@ -255,9 +257,9 @@ void VideoCaptureManager::Close(int capture_session_id) { } // Notify listeners asynchronously, and forget the session. - base::MessageLoop::current()->PostTask(FROM_HERE, - base::Bind(&VideoCaptureManager::OnClosed, this, session_it->second.type, - capture_session_id)); + base::ThreadTaskRunnerHandle::Get()->PostTask( + FROM_HERE, base::Bind(&VideoCaptureManager::OnClosed, this, + session_it->second.type, capture_session_id)); sessions_.erase(session_it); } diff --git a/content/browser/renderer_host/media/video_capture_manager_unittest.cc b/content/browser/renderer_host/media/video_capture_manager_unittest.cc index a8e45ad..832b0dc 100644 --- a/content/browser/renderer_host/media/video_capture_manager_unittest.cc +++ b/content/browser/renderer_host/media/video_capture_manager_unittest.cc @@ -9,7 +9,6 @@ #include "base/bind.h" #include "base/memory/ref_counted.h" #include "base/memory/scoped_ptr.h" -#include "base/message_loop/message_loop.h" #include "base/run_loop.h" #include "content/browser/browser_thread_impl.h" #include "content/browser/renderer_host/media/media_stream_provider.h" @@ -88,7 +87,7 @@ class VideoCaptureManagerTest : public testing::Test { vcm_->video_capture_device_factory()); const int32 kNumberOfFakeDevices = 2; video_capture_device_factory_->set_number_of_devices(kNumberOfFakeDevices); - vcm_->Register(listener_.get(), message_loop_->message_loop_proxy().get()); + vcm_->Register(listener_.get(), message_loop_->task_runner().get()); frame_observer_.reset(new MockFrameObserver()); } diff --git a/content/browser/renderer_host/p2p/socket_host_tcp.cc b/content/browser/renderer_host/p2p/socket_host_tcp.cc index a92e3e5..dd49bff 100644 --- a/content/browser/renderer_host/p2p/socket_host_tcp.cc +++ b/content/browser/renderer_host/p2p/socket_host_tcp.cc @@ -4,6 +4,8 @@ #include "content/browser/renderer_host/p2p/socket_host_tcp.h" +#include "base/location.h" +#include "base/single_thread_task_runner.h" #include "base/sys_byteorder.h" #include "content/common/p2p_messages.h" #include "ipc/ipc_sender.h" @@ -117,10 +119,9 @@ bool P2PSocketHostTcpBase::Init(const net::IPEndPoint& local_address, // the connect always happens asynchronously. base::MessageLoop* message_loop = base::MessageLoop::current(); CHECK(message_loop); - message_loop->PostTask( - FROM_HERE, - base::Bind(&P2PSocketHostTcpBase::OnConnected, - base::Unretained(this), status)); + message_loop->task_runner()->PostTask( + FROM_HERE, base::Bind(&P2PSocketHostTcpBase::OnConnected, + base::Unretained(this), status)); } return state_ != STATE_ERROR; diff --git a/content/browser/renderer_host/pepper/quota_reservation_unittest.cc b/content/browser/renderer_host/pepper/quota_reservation_unittest.cc index 6eb6f13..5d7445b 100644 --- a/content/browser/renderer_host/pepper/quota_reservation_unittest.cc +++ b/content/browser/renderer_host/pepper/quota_reservation_unittest.cc @@ -9,8 +9,10 @@ #include "base/files/file.h" #include "base/files/file_util.h" #include "base/files/scoped_temp_dir.h" -#include "base/message_loop/message_loop.h" +#include "base/location.h" #include "base/run_loop.h" +#include "base/single_thread_task_runner.h" +#include "base/thread_task_runner_handle.h" #include "storage/browser/fileapi/quota/quota_reservation.h" #include "testing/gtest/include/gtest/gtest.h" @@ -40,7 +42,7 @@ class FakeBackend : public QuotaReservationManager::QuotaBackend { storage::FileSystemType type, int64 delta, const QuotaReservationManager::ReserveQuotaCallback& callback) override { - base::MessageLoopProxy::current()->PostTask( + base::ThreadTaskRunnerHandle::Get()->PostTask( FROM_HERE, base::Bind(base::IgnoreResult(callback), base::File::FILE_OK, delta)); } diff --git a/content/browser/renderer_host/render_process_host_impl.cc b/content/browser/renderer_host/render_process_host_impl.cc index f32d2bb..d4da1d4 100644 --- a/content/browser/renderer_host/render_process_host_impl.cc +++ b/content/browser/renderer_host/render_process_host_impl.cc @@ -19,12 +19,14 @@ #include "base/debug/dump_without_crashing.h" #include "base/files/file.h" #include "base/lazy_instance.h" +#include "base/location.h" #include "base/logging.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" #include "base/process/process_handle.h" #include "base/profiler/scoped_tracker.h" #include "base/rand_util.h" +#include "base/single_thread_task_runner.h" #include "base/stl_util.h" #include "base/strings/string_number_conversions.h" #include "base/strings/string_util.h" diff --git a/content/browser/renderer_host/render_widget_host_impl.cc b/content/browser/renderer_host/render_widget_host_impl.cc index b987fbf..74f7ff4 100644 --- a/content/browser/renderer_host/render_widget_host_impl.cc +++ b/content/browser/renderer_host/render_widget_host_impl.cc @@ -14,9 +14,10 @@ #include "base/containers/hash_tables.h" #include "base/i18n/rtl.h" #include "base/lazy_instance.h" -#include "base/message_loop/message_loop.h" +#include "base/location.h" #include "base/metrics/field_trial.h" #include "base/metrics/histogram.h" +#include "base/single_thread_task_runner.h" #include "base/strings/string_number_conversions.h" #include "base/strings/utf_string_conversions.h" #include "base/thread_task_runner_handle.h" @@ -1534,10 +1535,9 @@ void RenderWidgetHostImpl::OnUpdateRect( bool post_callback = new_auto_size_.IsEmpty(); new_auto_size_ = params.view_size; if (post_callback) { - base::MessageLoop::current()->PostTask( - FROM_HERE, - base::Bind(&RenderWidgetHostImpl::DelayedAutoResized, - weak_factory_.GetWeakPtr())); + base::ThreadTaskRunnerHandle::Get()->PostTask( + FROM_HERE, base::Bind(&RenderWidgetHostImpl::DelayedAutoResized, + weak_factory_.GetWeakPtr())); } } diff --git a/content/browser/renderer_host/render_widget_host_unittest.cc b/content/browser/renderer_host/render_widget_host_unittest.cc index fc691c7..1787f66 100644 --- a/content/browser/renderer_host/render_widget_host_unittest.cc +++ b/content/browser/renderer_host/render_widget_host_unittest.cc @@ -5,8 +5,11 @@ #include "base/basictypes.h" #include "base/bind.h" #include "base/command_line.h" +#include "base/location.h" #include "base/memory/scoped_ptr.h" #include "base/memory/shared_memory.h" +#include "base/single_thread_task_runner.h" +#include "base/thread_task_runner_handle.h" #include "base/timer/timer.h" #include "content/browser/browser_thread_impl.h" #include "content/browser/gpu/compositor_util.h" @@ -979,9 +982,8 @@ TEST_F(RenderWidgetHostTest, DontPostponeHangMonitorTimeout) { host_->StartHangMonitorTimeout(TimeDelta::FromSeconds(30)); // Wait long enough for first timeout and see if it fired. - base::MessageLoop::current()->PostDelayedTask( - FROM_HERE, - base::MessageLoop::QuitClosure(), + base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( + FROM_HERE, base::MessageLoop::QuitClosure(), TimeDelta::FromMilliseconds(10)); base::MessageLoop::current()->Run(); EXPECT_TRUE(host_->unresponsive_timer_fired()); @@ -999,9 +1001,8 @@ TEST_F(RenderWidgetHostTest, StopAndStartHangMonitorTimeout) { host_->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(10)); // Wait long enough for first timeout and see if it fired. - base::MessageLoop::current()->PostDelayedTask( - FROM_HERE, - base::MessageLoop::QuitClosure(), + base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( + FROM_HERE, base::MessageLoop::QuitClosure(), TimeDelta::FromMilliseconds(40)); base::MessageLoop::current()->Run(); EXPECT_TRUE(host_->unresponsive_timer_fired()); @@ -1018,9 +1019,8 @@ TEST_F(RenderWidgetHostTest, ShorterDelayHangMonitorTimeout) { host_->StartHangMonitorTimeout(TimeDelta::FromMilliseconds(20)); // Wait long enough for the second timeout and see if it fired. - base::MessageLoop::current()->PostDelayedTask( - FROM_HERE, - base::MessageLoop::QuitClosure(), + base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( + FROM_HERE, base::MessageLoop::QuitClosure(), TimeDelta::FromMilliseconds(25)); base::MessageLoop::current()->Run(); EXPECT_TRUE(host_->unresponsive_timer_fired()); @@ -1037,18 +1037,16 @@ TEST_F(RenderWidgetHostTest, HangMonitorTimeoutDisabledForInputWhenHidden) { // The timeout should not fire. EXPECT_FALSE(host_->unresponsive_timer_fired()); - base::MessageLoop::current()->PostDelayedTask( - FROM_HERE, - base::MessageLoop::QuitClosure(), + base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( + FROM_HERE, base::MessageLoop::QuitClosure(), TimeDelta::FromMicroseconds(2)); base::MessageLoop::current()->Run(); EXPECT_FALSE(host_->unresponsive_timer_fired()); // The timeout should never reactivate while hidden. SimulateMouseEvent(WebInputEvent::MouseMove, 10, 10, 0, false); - base::MessageLoop::current()->PostDelayedTask( - FROM_HERE, - base::MessageLoop::QuitClosure(), + base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( + FROM_HERE, base::MessageLoop::QuitClosure(), TimeDelta::FromMicroseconds(2)); base::MessageLoop::current()->Run(); EXPECT_FALSE(host_->unresponsive_timer_fired()); @@ -1056,9 +1054,8 @@ TEST_F(RenderWidgetHostTest, HangMonitorTimeoutDisabledForInputWhenHidden) { // Showing the widget should restore the timeout, as the events have // not yet been ack'ed. host_->WasShown(ui::LatencyInfo()); - base::MessageLoop::current()->PostDelayedTask( - FROM_HERE, - base::MessageLoop::QuitClosure(), + base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( + FROM_HERE, base::MessageLoop::QuitClosure(), TimeDelta::FromMicroseconds(2)); base::MessageLoop::current()->Run(); EXPECT_TRUE(host_->unresponsive_timer_fired()); @@ -1079,9 +1076,8 @@ TEST_F(RenderWidgetHostTest, MultipleInputEvents) { INPUT_EVENT_ACK_STATE_CONSUMED); // Wait long enough for first timeout and see if it fired. - base::MessageLoop::current()->PostDelayedTask( - FROM_HERE, - base::MessageLoop::QuitClosure(), + base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( + FROM_HERE, base::MessageLoop::QuitClosure(), TimeDelta::FromMicroseconds(20)); base::MessageLoop::current()->Run(); EXPECT_TRUE(host_->unresponsive_timer_fired()); 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 7e6794a..464b915 100644 --- a/content/browser/renderer_host/render_widget_host_view_browsertest.cc +++ b/content/browser/renderer_host/render_widget_host_view_browsertest.cc @@ -4,9 +4,11 @@ #include "base/barrier_closure.h" #include "base/command_line.h" -#include "base/message_loop/message_loop_proxy.h" +#include "base/location.h" #include "base/path_service.h" #include "base/run_loop.h" +#include "base/single_thread_task_runner.h" +#include "base/thread_task_runner_handle.h" #include "content/browser/gpu/compositor_util.h" #include "content/browser/gpu/gpu_data_manager_impl.h" #include "content/browser/renderer_host/dip_util.h" @@ -129,15 +131,16 @@ class RenderWidgetHostViewBrowserTest : public ContentBrowserTest { } // Callback when using frame subscriber API. - void FrameDelivered(const scoped_refptr<base::MessageLoopProxy>& loop, - base::Closure quit_closure, - base::TimeTicks timestamp, - bool frame_captured) { + void FrameDelivered( + const scoped_refptr<base::SingleThreadTaskRunner>& task_runner, + base::Closure quit_closure, + base::TimeTicks timestamp, + bool frame_captured) { ++callback_invoke_count_; if (frame_captured) ++frames_captured_; if (!quit_closure.is_null()) - loop->PostTask(FROM_HERE, quit_closure); + task_runner->PostTask(FROM_HERE, quit_closure); } // Copy one frame using the CopyFromBackingStore API. @@ -182,9 +185,8 @@ class RenderWidgetHostViewBrowserTest : public ContentBrowserTest { // call stack. static void GiveItSomeTime() { base::RunLoop run_loop; - base::MessageLoop::current()->PostDelayedTask( - FROM_HERE, - run_loop.QuitClosure(), + base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( + FROM_HERE, run_loop.QuitClosure(), base::TimeDelta::FromMilliseconds(10)); run_loop.Run(); } @@ -339,11 +341,10 @@ IN_PROC_BROWSER_TEST_P(CompositingRenderWidgetHostViewBrowserTest, base::RunLoop run_loop; scoped_ptr<RenderWidgetHostViewFrameSubscriber> subscriber( - new FakeFrameSubscriber( - base::Bind(&RenderWidgetHostViewBrowserTest::FrameDelivered, - base::Unretained(this), - base::MessageLoopProxy::current(), - run_loop.QuitClosure()))); + new FakeFrameSubscriber(base::Bind( + &RenderWidgetHostViewBrowserTest::FrameDelivered, + base::Unretained(this), base::ThreadTaskRunnerHandle::Get(), + run_loop.QuitClosure()))); view->BeginFrameSubscription(subscriber.Pass()); run_loop.Run(); view->EndFrameSubscription(); @@ -373,12 +374,12 @@ IN_PROC_BROWSER_TEST_P(CompositingRenderWidgetHostViewBrowserTest, CopyTwice) { view->CopyFromCompositingSurfaceToVideoFrame( gfx::Rect(view->GetViewBounds().size()), first_output, base::Bind(&RenderWidgetHostViewBrowserTest::FrameDelivered, - base::Unretained(this), base::MessageLoopProxy::current(), + base::Unretained(this), base::ThreadTaskRunnerHandle::Get(), closure, base::TimeTicks::Now())); view->CopyFromCompositingSurfaceToVideoFrame( gfx::Rect(view->GetViewBounds().size()), second_output, base::Bind(&RenderWidgetHostViewBrowserTest::FrameDelivered, - base::Unretained(this), base::MessageLoopProxy::current(), + base::Unretained(this), base::ThreadTaskRunnerHandle::Get(), closure, base::TimeTicks::Now())); run_loop.Run(); diff --git a/content/browser/renderer_host/websocket_host.cc b/content/browser/renderer_host/websocket_host.cc index cd8dd25..801cee0 100644 --- a/content/browser/renderer_host/websocket_host.cc +++ b/content/browser/renderer_host/websocket_host.cc @@ -5,8 +5,11 @@ #include "content/browser/renderer_host/websocket_host.h" #include "base/basictypes.h" +#include "base/location.h" #include "base/memory/weak_ptr.h" +#include "base/single_thread_task_runner.h" #include "base/strings/string_util.h" +#include "base/thread_task_runner_handle.h" #include "content/browser/renderer_host/websocket_dispatcher_host.h" #include "content/browser/ssl/ssl_error_handler.h" #include "content/browser/ssl/ssl_manager.h" @@ -355,14 +358,10 @@ void WebSocketHost::OnAddChannelRequest( DCHECK(!channel_); if (delay_ > base::TimeDelta()) { - base::MessageLoop::current()->PostDelayedTask( + base::ThreadTaskRunnerHandle::Get()->PostDelayedTask( FROM_HERE, - base::Bind(&WebSocketHost::AddChannel, - weak_ptr_factory_.GetWeakPtr(), - socket_url, - requested_protocols, - origin, - render_frame_id), + base::Bind(&WebSocketHost::AddChannel, weak_ptr_factory_.GetWeakPtr(), + socket_url, requested_protocols, origin, render_frame_id), delay_); } else { AddChannel(socket_url, requested_protocols, origin, render_frame_id); @@ -394,11 +393,10 @@ void WebSocketHost::AddChannel( // We post OnFlowControl() here using |weak_ptr_factory_| instead of // calling SendFlowControl directly, because |this| may have been deleted // after channel_->SendAddChannelRequest(). - base::MessageLoop::current()->PostTask( - FROM_HERE, - base::Bind(&WebSocketHost::OnFlowControl, - weak_ptr_factory_.GetWeakPtr(), - pending_flow_control_quota_)); + base::ThreadTaskRunnerHandle::Get()->PostTask( + FROM_HERE, base::Bind(&WebSocketHost::OnFlowControl, + weak_ptr_factory_.GetWeakPtr(), + pending_flow_control_quota_)); pending_flow_control_quota_ = 0; } |