6 files changed, 8 insertions, 7 deletions
diff --git a/ui/aura/dispatcher_win.cc b/ui/aura/dispatcher_win.cc
index 7b2777d..2b4ca8a 100644
--- a/ui/aura/dispatcher_win.cc
+++ b/ui/aura/dispatcher_win.cc
@@ -26,7 +26,7 @@ bool DispatcherWin::Dispatch(const base::NativeEvent& msg) {
   return true;
 }
 
-MessageLoop::Dispatcher* CreateDispatcher() {
+base::MessageLoop::Dispatcher* CreateDispatcher() {
   return new DispatcherWin;
 }
 
diff --git a/ui/aura/env.cc b/ui/aura/env.cc
index 33a6b01..9d1bac5 100644
--- a/ui/aura/env.cc
+++ b/ui/aura/env.cc
@@ -64,7 +64,7 @@ void Env::RemoveObserver(EnvObserver* observer) {
 }
 
 #if !defined(OS_MACOSX)
-MessageLoop::Dispatcher* Env::GetDispatcher() {
+base::MessageLoop::Dispatcher* Env::GetDispatcher() {
 #if defined(USE_X11)
   return base::MessagePumpAuraX11::Current();
 #else
diff --git a/ui/aura/env.h b/ui/aura/env.h
index 99b0577..4ad55b6 100644
--- a/ui/aura/env.h
+++ b/ui/aura/env.h
@@ -24,7 +24,7 @@ class Window;
 
 #if !defined(USE_X11)
 // Creates a platform-specific native event dispatcher.
-MessageLoop::Dispatcher* CreateDispatcher();
+base::MessageLoop::Dispatcher* CreateDispatcher();
 #endif
 
 // A singleton object that tracks general state within Aura.
diff --git a/ui/base/win/singleton_hwnd.cc b/ui/base/win/singleton_hwnd.cc
index a4af8ab..aad849e 100644
--- a/ui/base/win/singleton_hwnd.cc
+++ b/ui/base/win/singleton_hwnd.cc
@@ -17,8 +17,8 @@ SingletonHwnd* SingletonHwnd::GetInstance() {
 void SingletonHwnd::AddObserver(Observer* observer) {
 
   if (!hwnd()) {
-    if (!MessageLoop::current() ||
-        MessageLoop::current()->type() != MessageLoop::TYPE_UI) {
+    if (!base::MessageLoop::current() ||
+        base::MessageLoop::current()->type() != base::MessageLoop::TYPE_UI) {
       // Creating this window in (e.g.) a renderer inhibits shutdown on
       // Windows. See http://crbug.com/230122 and http://crbug.com/236039.
       DLOG(ERROR) << "Cannot create windows on non-UI thread!";
diff --git a/ui/snapshot/snapshot_aura_unittest.cc b/ui/snapshot/snapshot_aura_unittest.cc
index 8f93c16..206069b 100644
--- a/ui/snapshot/snapshot_aura_unittest.cc
+++ b/ui/snapshot/snapshot_aura_unittest.cc
@@ -66,7 +66,8 @@ class SnapshotAuraTest : public testing::Test {
 
   virtual void SetUp() OVERRIDE {
     testing::Test::SetUp();
-    helper_.reset(new aura::test::AuraTestHelper(MessageLoopForUI::current()));
+    helper_.reset(
+        new aura::test::AuraTestHelper(base::MessageLoopForUI::current()));
     helper_->SetUp();
   }
 
diff --git a/ui/surface/accelerated_surface_win.cc b/ui/surface/accelerated_surface_win.cc
index bb19b7d..298f125 100644
--- a/ui/surface/accelerated_surface_win.cc
+++ b/ui/surface/accelerated_surface_win.cc
@@ -174,7 +174,7 @@ PresentThread::PresentThread(const char* name, uint64 adapter_luid)
 void PresentThread::SetAdapterLUID(uint64 adapter_luid) {
   base::AutoLock locked(lock_);
 
-  CHECK(message_loop() == MessageLoop::current());
+  CHECK(message_loop() == base::MessageLoop::current());
 
   if (adapter_luid_ == adapter_luid)
     return;