chrome: Use base::MessageLoop. (Part 1)

chrome/browser/* will be updated in another CL

BUG=236029
R=sky@chromium.org

Review URL: https://codereview.chromium.org/14314025

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@199547 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 12 insertions, 11 deletions

diff --git a/chrome/nacl/nacl_broker_listener.cc b/chrome/nacl/nacl_broker_listener.cc
index 9aea0ce..e310dfe 100644
--- a/chrome/nacl/nacl_broker_listener.cc
+++ b/chrome/nacl/nacl_broker_listener.cc
@@ -43,7 +43,7 @@ void NaClBrokerListener::Listen() {
   channel_.reset(new IPC::Channel(
       channel_name, IPC::Channel::MODE_CLIENT, this));
   CHECK(channel_->Connect());
-  MessageLoop::current()->Run();
+  base::MessageLoop::current()->Run();
 }
 
 // NOTE: changes to this method need to be reviewed by the security team.
@@ -81,7 +81,7 @@ bool NaClBrokerListener::OnMessageReceived(const IPC::Message& msg) {
 
 void NaClBrokerListener::OnChannelError() {
   // The browser died unexpectedly, quit to avoid a zombie process.
-  MessageLoop::current()->Quit();
+  base::MessageLoop::current()->Quit();
 }
 
 void NaClBrokerListener::OnLaunchLoaderThroughBroker(
@@ -125,5 +125,5 @@ void NaClBrokerListener::OnLaunchDebugExceptionHandler(
 }
 
 void NaClBrokerListener::OnStopBroker() {
-  MessageLoop::current()->Quit();
+  base::MessageLoop::current()->Quit();
 }
diff --git a/chrome/nacl/nacl_exe_win_64.cc b/chrome/nacl/nacl_exe_win_64.cc
index f0cb832..8d3df75 100644
--- a/chrome/nacl/nacl_exe_win_64.cc
+++ b/chrome/nacl/nacl_exe_win_64.cc
@@ -29,7 +29,7 @@ extern int NaClMain(const content::MainFunctionParams&);
 int NaClBrokerMain(const content::MainFunctionParams& parameters) {
   const CommandLine& parsed_command_line = parameters.command_line;
 
-  MessageLoopForIO main_message_loop;
+  base::MessageLoopForIO main_message_loop;
   base::PlatformThread::SetName("CrNaClBrokerMain");
 
   base::PowerMonitor power_monitor;
diff --git a/chrome/nacl/nacl_helper_linux.cc b/chrome/nacl/nacl_helper_linux.cc
index 53c2fb30..9ee476c 100644
--- a/chrome/nacl/nacl_helper_linux.cc
+++ b/chrome/nacl/nacl_helper_linux.cc
@@ -48,7 +48,7 @@ void BecomeNaClLoader(const std::vector<int>& child_fds,
   base::GlobalDescriptors::GetInstance()->Set(kPrimaryIPCChannel,
                                               child_fds[kNaClBrowserFDIndex]);
 
-  MessageLoopForIO main_message_loop;
+  base::MessageLoopForIO main_message_loop;
   NaClListener listener;
   listener.set_prereserved_sandbox_size(prereserved_sandbox_size);
   listener.Listen();
diff --git a/chrome/nacl/nacl_ipc_adapter_unittest.cc b/chrome/nacl/nacl_ipc_adapter_unittest.cc
index 992c26e..8a334d5 100644
--- a/chrome/nacl/nacl_ipc_adapter_unittest.cc
+++ b/chrome/nacl/nacl_ipc_adapter_unittest.cc
@@ -53,7 +53,7 @@ class NaClIPCAdapterTest : public testing::Test {
     return adapter_->Send(&msg);
   }
 
-  MessageLoop message_loop_;
+  base::MessageLoop message_loop_;
 
   scoped_refptr<NaClIPCAdapter> adapter_;
 
diff --git a/chrome/nacl/nacl_listener.cc b/chrome/nacl/nacl_listener.cc
index a154c77..b0b27e9 100644
--- a/chrome/nacl/nacl_listener.cc
+++ b/chrome/nacl/nacl_listener.cc
@@ -142,7 +142,8 @@ NaClListener::NaClListener() : shutdown_event_(true, false),
                                prereserved_sandbox_size_(0),
 #endif
                                main_loop_(NULL) {
-  io_thread_.StartWithOptions(base::Thread::Options(MessageLoop::TYPE_IO, 0));
+  io_thread_.StartWithOptions(
+      base::Thread::Options(base::MessageLoop::TYPE_IO, 0));
 #if defined(OS_WIN)
   DCHECK(g_listener == NULL);
   g_listener = this;
@@ -159,7 +160,7 @@ NaClListener::~NaClListener() {
 
 bool NaClListener::Send(IPC::Message* msg) {
   DCHECK(main_loop_ != NULL);
-  if (MessageLoop::current() == main_loop_) {
+  if (base::MessageLoop::current() == main_loop_) {
     // This thread owns the channel.
     return channel_->Send(msg);
   } else {
@@ -177,7 +178,7 @@ void NaClListener::Listen() {
   filter_ = new IPC::SyncMessageFilter(&shutdown_event_);
   channel_->AddFilter(filter_.get());
   channel_->Init(channel_name, IPC::Channel::MODE_CLIENT, true);
-  main_loop_ = MessageLoop::current();
+  main_loop_ = base::MessageLoop::current();
   main_loop_->Run();
 }
 
diff --git a/chrome/nacl/nacl_listener.h b/chrome/nacl/nacl_listener.h
index 20e3e78..2936eee 100644
--- a/chrome/nacl/nacl_listener.h
+++ b/chrome/nacl/nacl_listener.h
@@ -53,7 +53,7 @@ class NaClListener : public IPC::Listener {
 #endif
 
   // Used to identify what thread we're on.
-  MessageLoop* main_loop_;
+  base::MessageLoop* main_loop_;
 
   DISALLOW_COPY_AND_ASSIGN(NaClListener);
 };
diff --git a/chrome/nacl/nacl_main.cc b/chrome/nacl/nacl_main.cc
index 9b7a8c6..fa4835e 100644
--- a/chrome/nacl/nacl_main.cc
+++ b/chrome/nacl/nacl_main.cc
@@ -20,7 +20,7 @@ int NaClMain(const content::MainFunctionParams& parameters) {
   const CommandLine& parsed_command_line = parameters.command_line;
 
   // The main thread of the plugin services IO.
-  MessageLoopForIO main_message_loop;
+  base::MessageLoopForIO main_message_loop;
   base::PlatformThread::SetName("CrNaClMain");
 
   base::PowerMonitor power_monitor;