summaryrefslogtreecommitdiffstats
path: root/content/browser/renderer_host
diff options
context:
space:
mode:
Diffstat (limited to 'content/browser/renderer_host')
-rw-r--r--content/browser/renderer_host/media/media_stream_dispatcher_host_unittest.cc2
-rw-r--r--content/browser/renderer_host/p2p/socket_host_tcp_unittest.cc2
-rw-r--r--content/browser/renderer_host/render_widget_host_view_browsertest.cc2
-rw-r--r--content/browser/renderer_host/smooth_scroll_gesture_controller_unittest.cc10
4 files changed, 8 insertions, 8 deletions
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.