Use base::RunLoop instead of directly using MessageLoop in Drive related code.

chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc

 // Copyright 2013 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 "chrome/browser/chromeos/drive/drive_url_request_job.h"
 
 #include "base/bind.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
+#include "base/run_loop.h"
 #include "base/sequenced_task_runner.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread.h"
 #include "chrome/browser/chromeos/drive/drive_file_stream_reader.h"
 #include "chrome/browser/chromeos/drive/fake_file_system.h"
 #include "chrome/browser/chromeos/drive/file_system_util.h"
 #include "chrome/browser/chromeos/drive/test_util.h"
 #include "chrome/browser/drive/fake_drive_service.h"
-#include "chrome/browser/google_apis/task_util.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/test_completion_callback.h"
 #include "net/http/http_byte_range.h"
 #include "net/url_request/url_request_test_util.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ skipping 120 matching lines @@
         new base::Thread("ReadDriveFileSync"));
     if (!worker_thread->Start())
       return false;
 
     scoped_ptr<DriveFileStreamReader> reader(new DriveFileStreamReader(
         base::Bind(&DriveURLRequestJobTest::GetFileSystem,
                    base::Unretained(this)),
         worker_thread->message_loop_proxy()));
     int error = net::ERR_FAILED;
     scoped_ptr<ResourceEntry> entry;
-    reader->Initialize(
-        file_path,
-        net::HttpByteRange(),
-        google_apis::CreateComposedCallback(
-            base::Bind(&google_apis::test_util::RunAndQuit),
-            google_apis::test_util::CreateCopyResultCallback(
-                &error, &entry)));
-    base::MessageLoop::current()->Run();
+    {
+      base::RunLoop run_loop;
+      reader->Initialize(
+          file_path,
+          net::HttpByteRange(),
+          google_apis::test_util::CreateQuitCallback(
+              &run_loop,
+              google_apis::test_util::CreateCopyResultCallback(
+                  &error, &entry)));
+      run_loop.Run();
+    }
     if (error != net::OK || !entry)
       return false;
 
     // Read data from the reader.
     std::string content;
     if (test_util::ReadAllData(reader.get(), &content) != net::OK)
       return false;
 
     if (static_cast<size_t>(entry->file_info().size()) != content.size())
       return false;
@@ skipping 13 matching lines @@
   scoped_ptr<TestDelegate> test_delegate_;
 };
 
 TEST_F(DriveURLRequestJobTest, NonGetMethod) {
   net::URLRequest request(
       GURL("drive:drive/root/File 1.txt"), test_delegate_.get(),
       url_request_context_.get(), test_network_delegate_.get());
   request.set_method("POST");  // Set non "GET" method.
   request.Start();
 
-  base::MessageLoop::current()->Run();
+  base::RunLoop().Run();
 
   EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status());
   EXPECT_EQ(net::ERR_METHOD_NOT_SUPPORTED, request.status().error());
 }
 
 TEST_F(DriveURLRequestJobTest, RegularFile) {
   const GURL kTestUrl("drive:drive/root/File 1.txt");
   const base::FilePath kTestFilePath("drive/root/File 1.txt");
 
   // For the first time, the file should be fetched from the server.
   {
     net::URLRequest request(
         kTestUrl, test_delegate_.get(),
         url_request_context_.get(), test_network_delegate_.get());
     request.Start();
 
-    base::MessageLoop::current()->Run();
+    base::RunLoop().Run();
 
     EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
     // It looks weird, but the mime type for the "File 1.txt" is "audio/mpeg"
     // on the server.
     std::string mime_type;
     request.GetMimeType(&mime_type);
     EXPECT_EQ("audio/mpeg", mime_type);
 
     // Reading file must be done after |request| runs, otherwise
     // it'll create a local cache file, and we cannot test correctly.
     std::string expected_data;
     ASSERT_TRUE(ReadDriveFileSync(kTestFilePath, &expected_data));
     EXPECT_EQ(expected_data, test_delegate_->data_received());
   }
 
   // For the second time, the locally cached file should be used.
   // The caching emulation is done by FakeFileSystem.
   {
     test_delegate_.reset(new TestDelegate);
     net::URLRequest request(
         GURL("drive:drive/root/File 1.txt"), test_delegate_.get(),
         url_request_context_.get(), test_network_delegate_.get());
     request.Start();
 
-    base::MessageLoop::current()->Run();
+    base::RunLoop().Run();
 
     EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
     std::string mime_type;
     request.GetMimeType(&mime_type);
     EXPECT_EQ("audio/mpeg", mime_type);
 
     std::string expected_data;
     ASSERT_TRUE(ReadDriveFileSync(kTestFilePath, &expected_data));
     EXPECT_EQ(expected_data, test_delegate_->data_received());
   }
 }
 
 TEST_F(DriveURLRequestJobTest, HostedDocument) {
   // Open a gdoc file.
   test_delegate_->set_quit_on_redirect(true);
   net::URLRequest request(
       GURL("drive:drive/root/Document 1 excludeDir-test.gdoc"),
       test_delegate_.get(),
       url_request_context_.get(), test_network_delegate_.get());
   request.Start();
 
-  base::MessageLoop::current()->Run();
+  base::RunLoop().Run();
 
   EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
   // Make sure that a hosted document triggers redirection.
   EXPECT_TRUE(request.is_redirecting());
   EXPECT_EQ(GURL("https://3_document_alternate_link"),
             test_delegate_->redirect_url());
 }
 
 TEST_F(DriveURLRequestJobTest, RootDirectory) {
   net::URLRequest request(
       GURL("drive:drive/root"), test_delegate_.get(),
       url_request_context_.get(), test_network_delegate_.get());
   request.Start();
 
-  base::MessageLoop::current()->Run();
+  base::RunLoop().Run();
 
   EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status());
   EXPECT_EQ(net::ERR_FAILED, request.status().error());
 }
 
 TEST_F(DriveURLRequestJobTest, Directory) {
   net::URLRequest request(
       GURL("drive:drive/root/Directory 1"), test_delegate_.get(),
       url_request_context_.get(), test_network_delegate_.get());
   request.Start();
 
-  base::MessageLoop::current()->Run();
+  base::RunLoop().Run();
 
   EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status());
   EXPECT_EQ(net::ERR_FAILED, request.status().error());
 }
 
 TEST_F(DriveURLRequestJobTest, NonExistingFile) {
   net::URLRequest request(
       GURL("drive:drive/root/non-existing-file.txt"), test_delegate_.get(),
       url_request_context_.get(), test_network_delegate_.get());
   request.Start();
 
-  base::MessageLoop::current()->Run();
+  base::RunLoop().Run();
 
   EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status());
   EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request.status().error());
 }
 
 TEST_F(DriveURLRequestJobTest, WrongFormat) {
   net::URLRequest request(
       GURL("drive:"), test_delegate_.get(),
       url_request_context_.get(), test_network_delegate_.get());
   request.Start();
 
-  base::MessageLoop::current()->Run();
+  base::RunLoop().Run();
 
   EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status());
   EXPECT_EQ(net::ERR_INVALID_URL, request.status().error());
 }
 
 TEST_F(DriveURLRequestJobTest, Cancel) {
   net::URLRequest request(
       GURL("drive:drive/root/File 1.txt"), test_delegate_.get(),
       url_request_context_.get(), test_network_delegate_.get());
 
   // Start the request, and cancel it immediately after it.
   request.Start();
   request.Cancel();
 
-  base::MessageLoop::current()->Run();
+  base::RunLoop().Run();
 
   EXPECT_EQ(net::URLRequestStatus::CANCELED, request.status().status());
 }
 
 TEST_F(DriveURLRequestJobTest, RangeHeader) {
   const GURL kTestUrl("drive:drive/root/File 1.txt");
   const base::FilePath kTestFilePath("drive/root/File 1.txt");
 
   net::URLRequest request(
       kTestUrl, test_delegate_.get(),
       url_request_context_.get(), test_network_delegate_.get());
 
   // Set range header.
   request.SetExtraRequestHeaderByName(
       "Range", "bytes=3-5", false /* overwrite */);
   request.Start();
 
-  base::MessageLoop::current()->Run();
+  base::RunLoop().Run();
 
   EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
 
   // Reading file must be done after |request| runs, otherwise
   // it'll create a local cache file, and we cannot test correctly.
   std::string expected_data;
   ASSERT_TRUE(ReadDriveFileSync(kTestFilePath, &expected_data));
   EXPECT_EQ(expected_data.substr(3, 3), test_delegate_->data_received());
 }
 
 TEST_F(DriveURLRequestJobTest, WrongRangeHeader) {
   const GURL kTestUrl("drive:drive/root/File 1.txt");
 
   net::URLRequest request(
       kTestUrl, test_delegate_.get(),
       url_request_context_.get(), test_network_delegate_.get());
 
   // Set range header.
   request.SetExtraRequestHeaderByName(
       "Range", "Wrong Range Header Value", false /* overwrite */);
   request.Start();
 
-  base::MessageLoop::current()->Run();
+  base::RunLoop().Run();
 
   EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status());
   EXPECT_EQ(net::ERR_REQUEST_RANGE_NOT_SATISFIABLE, request.status().error());
 }
 
 }  // namespace drive