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

chrome/browser/google_apis/base_requests_server_unittest.cc

 // Copyright (c) 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/google_apis/base_requests.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/memory/scoped_ptr.h"
-#include "base/message_loop.h"
-#include "base/values.h"
+#include "base/run_loop.h"
 #include "chrome/browser/google_apis/auth_service.h"
 #include "chrome/browser/google_apis/request_sender.h"
 #include "chrome/browser/google_apis/task_util.h"
 #include "chrome/browser/google_apis/test_util.h"
 #include "chrome/test/base/testing_profile.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
 #include "net/test/embedded_test_server/http_request.h"
 #include "net/test/embedded_test_server/http_response.h"
@@ skipping 56 matching lines @@
 
   // The incoming HTTP request is saved so tests can verify the request
   // parameters like HTTP method (ex. some requests should use DELETE
   // instead of GET).
   net::test_server::HttpRequest http_request_;
 };
 
 TEST_F(BaseRequestsServerTest, DownloadFileRequest_ValidFile) {
   GDataErrorCode result_code = GDATA_OTHER_ERROR;
   base::FilePath temp_file;
-  DownloadFileRequest* request = new DownloadFileRequest(
-      request_sender_.get(),
-      request_context_getter_.get(),
-      CreateComposedCallback(
-          base::Bind(&test_util::RunAndQuit),
-          test_util::CreateCopyResultCallback(&result_code, &temp_file)),
-      GetContentCallback(),
-      ProgressCallback(),
-      test_server_.GetURL("/files/chromeos/gdata/testfile.txt"),
-      GetTestCachedFilePath(
-          base::FilePath::FromUTF8Unsafe("cached_testfile.txt")));
-  request_sender_->StartRequestWithRetry(request);
-  base::MessageLoop::current()->Run();
+  {
+    base::RunLoop run_loop;
+    DownloadFileRequest* request = new DownloadFileRequest(
+        request_sender_.get(),
+        request_context_getter_.get(),
+        test_util::CreateQuitCallback(
+            &run_loop,
+            test_util::CreateCopyResultCallback(&result_code, &temp_file)),
+        GetContentCallback(),
+        ProgressCallback(),
+        test_server_.GetURL("/files/chromeos/gdata/testfile.txt"),
+        GetTestCachedFilePath(
+            base::FilePath::FromUTF8Unsafe("cached_testfile.txt")));
+    request_sender_->StartRequestWithRetry(request);
+    run_loop.Run();
+  }
 
   std::string contents;
   file_util::ReadFileToString(temp_file, &contents);
   file_util::Delete(temp_file, false);
 
   EXPECT_EQ(HTTP_SUCCESS, result_code);
   EXPECT_EQ(net::test_server::METHOD_GET, http_request_.method);
   EXPECT_EQ("/files/chromeos/gdata/testfile.txt", http_request_.relative_url);
 
   const base::FilePath expected_path =
       test_util::GetTestFilePath("chromeos/gdata/testfile.txt");
   std::string expected_contents;
   file_util::ReadFileToString(expected_path, &expected_contents);
   EXPECT_EQ(expected_contents, contents);
 }
 
 TEST_F(BaseRequestsServerTest, DownloadFileRequest_NonExistentFile) {
   GDataErrorCode result_code = GDATA_OTHER_ERROR;
   base::FilePath temp_file;
-  DownloadFileRequest* request = new DownloadFileRequest(
-      request_sender_.get(),
-      request_context_getter_.get(),
-      CreateComposedCallback(
-          base::Bind(&test_util::RunAndQuit),
-          test_util::CreateCopyResultCallback(&result_code, &temp_file)),
-      GetContentCallback(),
-      ProgressCallback(),
-      test_server_.GetURL("/files/chromeos/gdata/no-such-file.txt"),
-      GetTestCachedFilePath(
-          base::FilePath::FromUTF8Unsafe("cache_no-such-file.txt")));
-  request_sender_->StartRequestWithRetry(request);
-  base::MessageLoop::current()->Run();
-
+  {
+    base::RunLoop run_loop;
+    DownloadFileRequest* request = new DownloadFileRequest(
+        request_sender_.get(),
+        request_context_getter_.get(),
+        test_util::CreateQuitCallback(
+            &run_loop,
+            test_util::CreateCopyResultCallback(&result_code, &temp_file)),
+        GetContentCallback(),
+        ProgressCallback(),
+        test_server_.GetURL("/files/chromeos/gdata/no-such-file.txt"),
+        GetTestCachedFilePath(
+            base::FilePath::FromUTF8Unsafe("cache_no-such-file.txt")));
+    request_sender_->StartRequestWithRetry(request);
+    run_loop.Run();
+  }
   EXPECT_EQ(HTTP_NOT_FOUND, result_code);
   EXPECT_EQ(net::test_server::METHOD_GET, http_request_.method);
   EXPECT_EQ("/files/chromeos/gdata/no-such-file.txt",
             http_request_.relative_url);
   // Do not verify the not found message.
 }
 
 }  // namespace google_apis