android_webview: Use base::MessageLoop.

BUG=236029

Review URL: https://chromiumcodereview.appspot.com/14314022

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

7 files changed, 15 insertions, 16 deletions

diff --git a/android_webview/browser/aw_browser_main_parts.cc b/android_webview/browser/aw_browser_main_parts.cc
index 60eb77c..55a5673 100644
--- a/android_webview/browser/aw_browser_main_parts.cc
+++ b/android_webview/browser/aw_browser_main_parts.cc
@@ -43,8 +43,8 @@ void AwBrowserMainParts::PreEarlyInitialization() {
   // Android WebView does not use default MessageLoop. It has its own
   // Android specific MessageLoop. Also see MainMessageLoopRun.
   DCHECK(!main_message_loop_.get());
-  main_message_loop_.reset(new MessageLoop(MessageLoop::TYPE_UI));
-  MessageLoopForUI::current()->Start();
+  main_message_loop_.reset(new base::MessageLoop(base::MessageLoop::TYPE_UI));
+  base::MessageLoopForUI::current()->Start();
 }
 
 int AwBrowserMainParts::PreCreateThreads() {
diff --git a/android_webview/browser/net/android_stream_reader_url_request_job.cc b/android_webview/browser/net/android_stream_reader_url_request_job.cc
index de7e5b6..bcacea0 100644
--- a/android_webview/browser/net/android_stream_reader_url_request_job.cc
+++ b/android_webview/browser/net/android_stream_reader_url_request_job.cc
@@ -135,7 +135,7 @@ void AndroidStreamReaderURLRequestJob::Start() {
       FROM_HERE,
       base::Bind(
           &OpenInputStreamOnWorkerThread,
-          MessageLoop::current()->message_loop_proxy(),
+          base::MessageLoop::current()->message_loop_proxy(),
           // This is intentional - the job could be deleted while the callback
           // is executing on the background thread.
           // The delegate will be "returned" to the job once the InputStream
diff --git a/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc b/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
index 39eb205..0e83a40 100644
--- a/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
+++ b/android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc
@@ -147,9 +147,8 @@ class TestStreamReaderJob : public AndroidStreamReaderURLRequestJob {
 
 class AndroidStreamReaderURLRequestJobTest : public Test {
  public:
-  AndroidStreamReaderURLRequestJobTest()
-      : loop_(MessageLoop::TYPE_IO) {
-  }
+  AndroidStreamReaderURLRequestJobTest() : loop_(base::MessageLoop::TYPE_IO) {}
+
  protected:
   virtual void SetUp() {
     context_.set_job_factory(&factory_);
@@ -198,7 +197,7 @@ class AndroidStreamReaderURLRequestJobTest : public Test {
     DCHECK(set_protocol);
   }
 
-  MessageLoop loop_;
+  base::MessageLoop loop_;
   TestURLRequestContext context_;
   android_webview::AwURLRequestJobFactory factory_;
   TestDelegate url_request_delegate_;
@@ -222,7 +221,7 @@ TEST_F(AndroidStreamReaderURLRequestJobTest, ReadEmptyStream) {
   req_->Start();
 
   // The TestDelegate will quit the message loop on request completion.
-  MessageLoop::current()->Run();
+  base::MessageLoop::current()->Run();
 
   EXPECT_FALSE(url_request_delegate_.request_failed());
   EXPECT_EQ(1, network_delegate_.completed_requests());
@@ -237,7 +236,7 @@ TEST_F(AndroidStreamReaderURLRequestJobTest, ReadWithNullStream) {
   req_->Start();
 
   // The TestDelegate will quit the message loop on request completion.
-  MessageLoop::current()->Run();
+  base::MessageLoop::current()->Run();
 
   // The request_failed() method is named confusingly but all it checks is
   // whether the request got as far as calling NotifyHeadersComplete.
@@ -271,7 +270,7 @@ TEST_F(AndroidStreamReaderURLRequestJobTest, ReadPartOfStream) {
   SetRange(req_.get(), offset, bytes_available);
   req_->Start();
 
-  MessageLoop::current()->Run();
+  base::MessageLoop::current()->Run();
 
   EXPECT_FALSE(url_request_delegate_.request_failed());
   EXPECT_EQ(bytes_to_read, url_request_delegate_.bytes_received());
@@ -302,7 +301,7 @@ TEST_F(AndroidStreamReaderURLRequestJobTest,
   SetRange(req_.get(), offset, bytes_available_reported);
   req_->Start();
 
-  MessageLoop::current()->Run();
+  base::MessageLoop::current()->Run();
 
   EXPECT_FALSE(url_request_delegate_.request_failed());
   EXPECT_EQ(bytes_to_read, url_request_delegate_.bytes_received());
diff --git a/android_webview/lib/main/aw_main_delegate.cc b/android_webview/lib/main/aw_main_delegate.cc
index 74bfb52..45207ae 100644
--- a/android_webview/lib/main/aw_main_delegate.cc
+++ b/android_webview/lib/main/aw_main_delegate.cc
@@ -85,7 +85,7 @@ MessageLoop* GetRendererCompositorThreadOverrideLoop() {
   if (!UIAndRendererCompositorThreadsMerged())
     return NULL;
 
-  MessageLoop* rv = content::BrowserThread::UnsafeGetMessageLoopForThread(
+  base::MessageLoop* rv = content::BrowserThread::UnsafeGetMessageLoopForThread(
       content::BrowserThread::UI);
   DCHECK(rv);
   return rv;
diff --git a/android_webview/native/aw_contents.cc b/android_webview/native/aw_contents.cc
index 2fd6a88..58a89c2 100644
--- a/android_webview/native/aw_contents.cc
+++ b/android_webview/native/aw_contents.cc
@@ -611,7 +611,7 @@ void AwContents::SetPendingWebContentsForPopup(
     // TODO(benm): Support holding multiple pop up window requests.
     LOG(WARNING) << "Blocking popup window creation as an outstanding "
                  << "popup window is still pending.";
-    MessageLoop::current()->DeleteSoon(FROM_HERE, pending.release());
+    base::MessageLoop::current()->DeleteSoon(FROM_HERE, pending.release());
     return;
   }
   pending_contents_ = pending.Pass();
diff --git a/android_webview/native/aw_web_contents_delegate.cc b/android_webview/native/aw_web_contents_delegate.cc
index 8c76bc4..3b6aae2 100644
--- a/android_webview/native/aw_web_contents_delegate.cc
+++ b/android_webview/native/aw_web_contents_delegate.cc
@@ -96,7 +96,7 @@ void AwWebContentsDelegate::AddNewContents(content::WebContents* source,
     // window, so we're done with the WebContents now. We use
     // DeleteSoon as WebContentsImpl may call methods on |new_contents|
     // after this method returns.
-    MessageLoop::current()->DeleteSoon(FROM_HERE, new_contents);
+    base::MessageLoop::current()->DeleteSoon(FROM_HERE, new_contents);
   }
 
   if (was_blocked) {
diff --git a/android_webview/renderer/aw_content_renderer_client.h b/android_webview/renderer/aw_content_renderer_client.h
index ba5a700..bcec659 100644
--- a/android_webview/renderer/aw_content_renderer_client.h
+++ b/android_webview/renderer/aw_content_renderer_client.h
@@ -18,7 +18,7 @@ namespace android_webview {
 
 class AwContentRendererClient : public content::ContentRendererClient {
  public:
-  typedef MessageLoop* CompositorMessageLoopGetter();
+  typedef base::MessageLoop* CompositorMessageLoopGetter();
 
   explicit AwContentRendererClient(
       CompositorMessageLoopGetter* compositor_message_loop_getter,
@@ -41,7 +41,7 @@ class AwContentRendererClient : public content::ContentRendererClient {
                                              size_t length) OVERRIDE;
   virtual bool IsLinkVisited(unsigned long long link_hash) OVERRIDE;
   virtual void PrefetchHostName(const char* hostname, size_t length) OVERRIDE;
-  virtual MessageLoop* OverrideCompositorMessageLoop() const OVERRIDE;
+  virtual base::MessageLoop* OverrideCompositorMessageLoop() const OVERRIDE;
   virtual bool ShouldCreateCompositorInputHandler() const OVERRIDE;
 
  private: