android_webview: Use base::MessageLoop.

android_webview/browser/net/android_stream_reader_url_request_job_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "android_webview/browser/input_stream.h"
 #include "android_webview/browser/net/android_stream_reader_url_request_job.h"
 #include "android_webview/browser/net/aw_url_request_job_factory.h"
 #include "android_webview/browser/net/input_stream_reader.h"
 #include "base/format_macros.h"
 #include "base/message_loop.h"
@@ skipping 129 matching lines @@
   virtual base::TaskRunner* GetWorkerThreadRunner() {
     return message_loop_proxy_.get();
   }
 
   scoped_ptr<InputStreamReader> stream_reader_;
   scoped_refptr<base::MessageLoopProxy> message_loop_proxy_;
 };
 
 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_);
     context_.set_network_delegate(&network_delegate_);
     req_.reset(
         new TestURLRequest(GURL("content://foo"),
                            &url_request_delegate_,
                            &context_,
                            &network_delegate_));
     req_->set_method("GET");
@@ skipping 28 matching lines @@
     protocol_handler->set_main_intercept_job(test_stream_reader_job);
     bool set_protocol = factory_.SetProtocolHandler("http", protocol_handler);
     DCHECK(set_protocol);
 
     protocol_handler = new TestJobInterceptor;
     protocol_handler->set_main_intercept_job(test_stream_reader_job);
     set_protocol = factory_.SetProtocolHandler("content", protocol_handler);
     DCHECK(set_protocol);
   }
 
-  MessageLoop loop_;
+  base::MessageLoop loop_;
   TestURLRequestContext context_;
   android_webview::AwURLRequestJobFactory factory_;
   TestDelegate url_request_delegate_;
   TestNetworkDelegate network_delegate_;
   scoped_ptr<TestURLRequest> req_;
 };
 
 TEST_F(AndroidStreamReaderURLRequestJobTest, ReadEmptyStream) {
   scoped_ptr<StrictMock<MockInputStreamReader> > stream_reader(
       new StrictMock<MockInputStreamReader>());
   {
     InSequence s;
     EXPECT_CALL(*stream_reader, Seek(_))
         .WillOnce(Return(0));
     EXPECT_CALL(*stream_reader, ReadRawData(NotNull(), Gt(0)))
         .WillOnce(Return(0));
   }
 
   SetUpTestJob(stream_reader.PassAs<InputStreamReader>());
 
   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());
   EXPECT_EQ(0, network_delegate_.error_count());
   EXPECT_EQ(200, req_->GetResponseCode());
 }
 
 TEST_F(AndroidStreamReaderURLRequestJobTest, ReadWithNullStream) {
   SetUpTestJob(scoped_ptr<InputStreamReader>(),
                make_scoped_ptr(new NullStreamReaderDelegate())
                    .PassAs<AndroidStreamReaderURLRequestJob::Delegate>());
   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.
   EXPECT_FALSE(url_request_delegate_.request_failed());
   EXPECT_EQ(1, network_delegate_.completed_requests());
   // A null input stream shouldn't result in an error. See crbug.com/180950.
   EXPECT_EQ(0, network_delegate_.error_count());
   EXPECT_EQ(404, req_->GetResponseCode());
 }
 
@@ skipping 13 matching lines @@
         .WillOnce(Return(bytes_to_read/2));
     EXPECT_CALL(*stream_reader, ReadRawData(NotNull(), Ge(bytes_to_read)))
         .WillOnce(Return(0));
   }
 
   SetUpTestJob(stream_reader.PassAs<InputStreamReader>());
 
   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());
   EXPECT_EQ(1, network_delegate_.completed_requests());
   EXPECT_EQ(0, network_delegate_.error_count());
 }
 
 TEST_F(AndroidStreamReaderURLRequestJobTest,
        ReadStreamWithMoreAvailableThanActual) {
   const int bytes_available_reported = 190;
@@ skipping 10 matching lines @@
         .WillOnce(Return(bytes_available));
     EXPECT_CALL(*stream_reader, ReadRawData(NotNull(), Ge(bytes_to_read)))
         .WillOnce(Return(0));
   }
 
   SetUpTestJob(stream_reader.PassAs<InputStreamReader>());
 
   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());
   EXPECT_EQ(1, network_delegate_.completed_requests());
   EXPECT_EQ(0, network_delegate_.error_count());
 }
 
 TEST_F(AndroidStreamReaderURLRequestJobTest, DeleteJobMidWaySeek) {
   const int offset = 20;
   const int bytes_available = 128;
@@ skipping 35 matching lines @@
 
   SetRange(req_.get(), offset, bytes_available);
   req_->Start();
 
   loop.Run();
 
   EXPECT_EQ(0, network_delegate_.completed_requests());
   req_->Cancel();
   EXPECT_EQ(1, network_delegate_.completed_requests());
 }