Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1929)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/google_apis/drive_api_operations_unittest.cc

Issue 14113053: chrome: Use base::MessageLoop. (Part 3) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« chrome/browser/extensions/external_policy_loader_unittest.cc ('K') | « chrome/browser/google_apis/base_operations_unittest.cc ('k') | chrome/browser/google_apis/drive_uploader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/google_apis/drive_api_operations_unittest.cc
diff --git a/chrome/browser/google_apis/drive_api_operations_unittest.cc b/chrome/browser/google_apis/drive_api_operations_unittest.cc
index ecd9eb0f3ce93c97d939d11165549a79a591b5ed..7765a54fc2217a8b84a5e96060f8b0ac50c36c1b 100644
--- a/chrome/browser/google_apis/drive_api_operations_unittest.cc
+++ b/chrome/browser/google_apis/drive_api_operations_unittest.cc
@@ -91,7 +91,7 @@ class DriveApiOperationsTest : public testing::Test {
ResetExpectedResponse();
}
- MessageLoopForUI message_loop_;
+ base::MessageLoopForUI message_loop_;
content::TestBrowserThread ui_thread_;
content::TestBrowserThread file_thread_;
content::TestBrowserThread io_thread_;
@@ -317,7 +317,7 @@ TEST_F(DriveApiOperationsTest, GetAboutOperation_ValidJson) {
test_util::CreateCopyResultCallback(&error, &about_resource)));
operation->Start(kTestDriveApiAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, error);
EXPECT_EQ(test_server::METHOD_GET, http_request_.method);
@@ -350,7 +350,7 @@ TEST_F(DriveApiOperationsTest, GetAboutOperation_InvalidJson) {
test_util::CreateCopyResultCallback(&error, &about_resource)));
operation->Start(kTestDriveApiAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
// "parse error" should be returned, and the about resource should be NULL.
EXPECT_EQ(GDATA_PARSE_ERROR, error);
@@ -376,7 +376,7 @@ TEST_F(DriveApiOperationsTest, GetApplistOperation) {
test_util::CreateCopyResultCallback(&error, &result)));
operation->Start(kTestDriveApiAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, error);
EXPECT_EQ(test_server::METHOD_GET, http_request_.method);
@@ -404,7 +404,7 @@ TEST_F(DriveApiOperationsTest, GetChangelistOperation) {
test_util::CreateCopyResultCallback(&error, &result)));
operation->Start(kTestDriveApiAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, error);
EXPECT_EQ(test_server::METHOD_GET, http_request_.method);
@@ -432,7 +432,7 @@ TEST_F(DriveApiOperationsTest, GetFilelistOperation) {
test_util::CreateCopyResultCallback(&error, &result)));
operation->Start(kTestDriveApiAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, error);
EXPECT_EQ(test_server::METHOD_GET, http_request_.method);
@@ -459,7 +459,7 @@ TEST_F(DriveApiOperationsTest, ContinueGetFileListOperation) {
test_util::CreateCopyResultCallback(&error, &result)));
operation->Start(kTestDriveApiAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, error);
EXPECT_EQ(test_server::METHOD_GET, http_request_.method);
@@ -488,7 +488,7 @@ TEST_F(DriveApiOperationsTest, CreateDirectoryOperation) {
test_util::CreateCopyResultCallback(&error, &file_resource)));
operation->Start(kTestDriveApiAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, error);
EXPECT_EQ(test_server::METHOD_POST, http_request_.method);
@@ -531,7 +531,7 @@ TEST_F(DriveApiOperationsTest, RenameResourceOperation) {
test_util::CreateCopyResultCallback(&error)));
operation->Start(kTestDriveApiAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, error);
EXPECT_EQ(test_server::METHOD_PATCH, http_request_.method);
@@ -564,7 +564,7 @@ TEST_F(DriveApiOperationsTest, CopyResourceOperation) {
test_util::CreateCopyResultCallback(&error, &file_resource)));
operation->Start(kTestDriveApiAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, error);
EXPECT_EQ(test_server::METHOD_POST, http_request_.method);
@@ -596,7 +596,7 @@ TEST_F(DriveApiOperationsTest, TrashResourceOperation) {
test_util::CreateCopyResultCallback(&error)));
operation->Start(kTestDriveApiAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, error);
EXPECT_EQ(test_server::METHOD_POST, http_request_.method);
@@ -626,7 +626,7 @@ TEST_F(DriveApiOperationsTest, InsertResourceOperation) {
test_util::CreateCopyResultCallback(&error)));
operation->Start(kTestDriveApiAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, error);
EXPECT_EQ(test_server::METHOD_POST, http_request_.method);
@@ -655,7 +655,7 @@ TEST_F(DriveApiOperationsTest, DeleteResourceOperation) {
test_util::CreateCopyResultCallback(&error)));
operation->Start(kTestDriveApiAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_NO_CONTENT, error);
EXPECT_EQ(test_server::METHOD_DELETE, http_request_.method);
@@ -691,7 +691,7 @@ TEST_F(DriveApiOperationsTest, UploadNewFileOperation) {
test_util::CreateCopyResultCallback(&error, &upload_url)));
operation->Start(kTestDriveApiAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, error);
EXPECT_EQ(kTestUploadNewFilePath, upload_url.path());
@@ -736,7 +736,7 @@ TEST_F(DriveApiOperationsTest, UploadNewFileOperation) {
resume_operation->Start(
kTestDriveApiAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
// METHOD_PUT should be used to upload data.
EXPECT_EQ(test_server::METHOD_PUT, http_request_.method);
@@ -785,7 +785,7 @@ TEST_F(DriveApiOperationsTest, UploadNewEmptyFileOperation) {
test_util::CreateCopyResultCallback(&error, &upload_url)));
operation->Start(kTestDriveApiAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, error);
EXPECT_EQ(kTestUploadNewFilePath, upload_url.path());
@@ -829,7 +829,7 @@ TEST_F(DriveApiOperationsTest, UploadNewEmptyFileOperation) {
resume_operation->Start(
kTestDriveApiAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
// METHOD_PUT should be used to upload data.
EXPECT_EQ(test_server::METHOD_PUT, http_request_.method);
@@ -876,7 +876,7 @@ TEST_F(DriveApiOperationsTest, UploadNewLargeFileOperation) {
test_util::CreateCopyResultCallback(&error, &upload_url)));
operation->Start(kTestDriveApiAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, error);
EXPECT_EQ(kTestUploadNewFilePath, upload_url.path());
@@ -927,7 +927,7 @@ TEST_F(DriveApiOperationsTest, UploadNewLargeFileOperation) {
resume_operation->Start(
kTestDriveApiAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
// METHOD_PUT should be used to upload data.
EXPECT_EQ(test_server::METHOD_PUT, http_request_.method);
@@ -986,7 +986,7 @@ TEST_F(DriveApiOperationsTest, UploadExistingFileOperation) {
test_util::CreateCopyResultCallback(&error, &upload_url)));
operation->Start(kTestDriveApiAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, error);
EXPECT_EQ(kTestUploadExistingFilePath, upload_url.path());
@@ -1026,7 +1026,7 @@ TEST_F(DriveApiOperationsTest, UploadExistingFileOperation) {
resume_operation->Start(
kTestDriveApiAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
// METHOD_PUT should be used to upload data.
EXPECT_EQ(test_server::METHOD_PUT, http_request_.method);
@@ -1074,7 +1074,7 @@ TEST_F(DriveApiOperationsTest, UploadExistingFileOperationWithETag) {
test_util::CreateCopyResultCallback(&error, &upload_url)));
operation->Start(kTestDriveApiAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, error);
EXPECT_EQ(kTestUploadExistingFilePath, upload_url.path());
@@ -1114,7 +1114,7 @@ TEST_F(DriveApiOperationsTest, UploadExistingFileOperationWithETag) {
resume_operation->Start(
kTestDriveApiAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
// METHOD_PUT should be used to upload data.
EXPECT_EQ(test_server::METHOD_PUT, http_request_.method);
@@ -1162,7 +1162,7 @@ TEST_F(DriveApiOperationsTest, UploadExistingFileOperationWithETagConflicting) {
test_util::CreateCopyResultCallback(&error, &upload_url)));
operation->Start(kTestDriveApiAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_PRECONDITION, error);
EXPECT_EQ(kTestContentType, http_request_.headers["X-Upload-Content-Type"]);
« chrome/browser/extensions/external_policy_loader_unittest.cc ('K') | « chrome/browser/google_apis/base_operations_unittest.cc ('k') | chrome/browser/google_apis/drive_uploader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698