| 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 59a7e10c7f52263680f9cd29567f23416ef1a365..1408d76988eec90d68dcea940a5db24f8ea1e1e6 100644
|
| --- a/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc
|
| +++ b/chrome/browser/chromeos/drive/drive_url_request_job_unittest.cc
|
| @@ -180,7 +180,7 @@ class DriveURLRequestJobTest : public testing::Test {
|
| return content;
|
| }
|
|
|
| - MessageLoopForIO message_loop_;
|
| + base::MessageLoopForIO message_loop_;
|
| content::TestBrowserThread ui_thread_;
|
| content::TestBrowserThread io_thread_;
|
|
|
| @@ -200,7 +200,7 @@ TEST_F(DriveURLRequestJobTest, NonGetMethod) {
|
| request.set_method("POST"); // Set non "GET" method.
|
| request.Start();
|
|
|
| - MessageLoop::current()->Run();
|
| + base::MessageLoop::current()->Run();
|
|
|
| EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status());
|
| EXPECT_EQ(net::ERR_METHOD_NOT_SUPPORTED, request.status().error());
|
| @@ -217,7 +217,7 @@ TEST_F(DriveURLRequestJobTest, RegularFile) {
|
| url_request_context_.get(), test_network_delegate_.get());
|
| request.Start();
|
|
|
| - MessageLoop::current()->Run();
|
| + base::MessageLoop::current()->Run();
|
|
|
| EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
|
| // It looks weird, but the mime type for the "File 1.txt" is "audio/mpeg"
|
| @@ -240,7 +240,7 @@ TEST_F(DriveURLRequestJobTest, RegularFile) {
|
| url_request_context_.get(), test_network_delegate_.get());
|
| request.Start();
|
|
|
| - MessageLoop::current()->Run();
|
| + base::MessageLoop::current()->Run();
|
|
|
| EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
|
| std::string mime_type;
|
| @@ -260,7 +260,7 @@ TEST_F(DriveURLRequestJobTest, HostedDocument) {
|
| url_request_context_.get(), test_network_delegate_.get());
|
| request.Start();
|
|
|
| - MessageLoop::current()->Run();
|
| + base::MessageLoop::current()->Run();
|
|
|
| EXPECT_EQ(net::URLRequestStatus::SUCCESS, request.status().status());
|
| // Make sure that a hosted document triggers redirection.
|
| @@ -275,7 +275,7 @@ TEST_F(DriveURLRequestJobTest, RootDirectory) {
|
| url_request_context_.get(), test_network_delegate_.get());
|
| request.Start();
|
|
|
| - MessageLoop::current()->Run();
|
| + base::MessageLoop::current()->Run();
|
|
|
| EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status());
|
| EXPECT_EQ(net::ERR_FAILED, request.status().error());
|
| @@ -287,7 +287,7 @@ TEST_F(DriveURLRequestJobTest, Directory) {
|
| url_request_context_.get(), test_network_delegate_.get());
|
| request.Start();
|
|
|
| - MessageLoop::current()->Run();
|
| + base::MessageLoop::current()->Run();
|
|
|
| EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status());
|
| EXPECT_EQ(net::ERR_FAILED, request.status().error());
|
| @@ -299,7 +299,7 @@ TEST_F(DriveURLRequestJobTest, NonExistingFile) {
|
| url_request_context_.get(), test_network_delegate_.get());
|
| request.Start();
|
|
|
| - MessageLoop::current()->Run();
|
| + base::MessageLoop::current()->Run();
|
|
|
| EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status());
|
| EXPECT_EQ(net::ERR_FILE_NOT_FOUND, request.status().error());
|
| @@ -311,7 +311,7 @@ TEST_F(DriveURLRequestJobTest, WrongFormat) {
|
| url_request_context_.get(), test_network_delegate_.get());
|
| request.Start();
|
|
|
| - MessageLoop::current()->Run();
|
| + base::MessageLoop::current()->Run();
|
|
|
| EXPECT_EQ(net::URLRequestStatus::FAILED, request.status().status());
|
| EXPECT_EQ(net::ERR_INVALID_URL, request.status().error());
|
| @@ -326,7 +326,7 @@ TEST_F(DriveURLRequestJobTest, Cancel) {
|
| request.Start();
|
| request.Cancel();
|
|
|
| - MessageLoop::current()->Run();
|
| + base::MessageLoop::current()->Run();
|
|
|
| EXPECT_EQ(net::URLRequestStatus::CANCELED, request.status().status());
|
| }
|
|
|