| Index: chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc
|
| diff --git a/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc b/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc
|
| index 4093cc56d55a8832f232ea2f946353bee5900b2e..7707efc3eeabc20a5a5661ca250fa60e6cf7a213 100644
|
| --- a/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc
|
| +++ b/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc
|
| @@ -7,6 +7,7 @@
|
| #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"
|
| @@ -156,14 +157,17 @@ class DriveURLRequestJobTest : public testing::Test {
|
| 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;
|
|
|
| @@ -197,7 +201,7 @@ TEST_F(DriveURLRequestJobTest, NonGetMethod) {
|
| 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());
|
| @@ -214,7 +218,7 @@ TEST_F(DriveURLRequestJobTest, RegularFile) {
|
| 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"
|
| @@ -239,7 +243,7 @@ TEST_F(DriveURLRequestJobTest, RegularFile) {
|
| 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;
|
| @@ -261,7 +265,7 @@ TEST_F(DriveURLRequestJobTest, HostedDocument) {
|
| 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.
|
| @@ -276,7 +280,7 @@ TEST_F(DriveURLRequestJobTest, RootDirectory) {
|
| 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());
|
| @@ -288,7 +292,7 @@ TEST_F(DriveURLRequestJobTest, Directory) {
|
| 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());
|
| @@ -300,7 +304,7 @@ TEST_F(DriveURLRequestJobTest, NonExistingFile) {
|
| 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());
|
| @@ -312,7 +316,7 @@ TEST_F(DriveURLRequestJobTest, WrongFormat) {
|
| 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());
|
| @@ -327,7 +331,7 @@ TEST_F(DriveURLRequestJobTest, Cancel) {
|
| request.Start();
|
| request.Cancel();
|
|
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
|
|
| EXPECT_EQ(net::URLRequestStatus::CANCELED, request.status().status());
|
| }
|
| @@ -345,7 +349,7 @@ TEST_F(DriveURLRequestJobTest, RangeHeader) {
|
| "Range", "bytes=3-5", false /* overwrite */);
|
| request.Start();
|
|
|
| - base::MessageLoop::current()->Run();
|
| + base::RunLoop().Run();
|
|
|
| EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
|
|
|
| @@ -368,7 +372,7 @@ TEST_F(DriveURLRequestJobTest, WrongRangeHeader) {
|
| "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());
|
|
|