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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/google_apis/gdata_wapi_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/fake_drive_service_unittest.cc ('k') | chrome/browser/google_apis/operation_registry_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/google_apis/gdata_wapi_operations_unittest.cc
diff --git a/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc b/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc
index 92b4838d98975df8cd771962ef9dc35375055e26..7cc22c3e861248aebd07f9c5df7459e257d0837a 100644
--- a/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc
+++ b/chrome/browser/google_apis/gdata_wapi_operations_unittest.cc
@@ -293,7 +293,7 @@ class GDataWapiOperationsTest : public testing::Test {
return response.Pass();
}
- MessageLoopForUI message_loop_;
+ base::MessageLoopForUI message_loop_;
content::TestBrowserThread ui_thread_;
content::TestBrowserThread file_thread_;
content::TestBrowserThread io_thread_;
@@ -336,7 +336,7 @@ TEST_F(GDataWapiOperationsTest, GetResourceListOperation_DefaultFeed) {
test_util::CreateCopyResultCallback(&result_code, &result_data)));
operation->Start(kTestGDataAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, result_code);
EXPECT_EQ(test_server::METHOD_GET, http_request_.method);
@@ -369,7 +369,7 @@ TEST_F(GDataWapiOperationsTest, GetResourceListOperation_ValidFeed) {
test_util::CreateCopyResultCallback(&result_code, &result_data)));
operation->Start(kTestGDataAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, result_code);
EXPECT_EQ(test_server::METHOD_GET, http_request_.method);
@@ -403,7 +403,7 @@ TEST_F(GDataWapiOperationsTest, GetResourceListOperation_InvalidFeed) {
test_util::CreateCopyResultCallback(&result_code, &result_data)));
operation->Start(kTestGDataAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(GDATA_PARSE_ERROR, result_code);
EXPECT_EQ(test_server::METHOD_GET, http_request_.method);
@@ -428,7 +428,7 @@ TEST_F(GDataWapiOperationsTest, SearchByTitleOperation) {
test_util::CreateCopyResultCallback(&result_code, &result_data)));
operation->Start(kTestGDataAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, result_code);
EXPECT_EQ(test_server::METHOD_GET, http_request_.method);
@@ -453,7 +453,7 @@ TEST_F(GDataWapiOperationsTest, GetResourceEntryOperation_ValidResourceId) {
test_util::CreateCopyResultCallback(&result_code, &result_data)));
operation->Start(kTestGDataAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, result_code);
EXPECT_EQ(test_server::METHOD_GET, http_request_.method);
@@ -479,7 +479,7 @@ TEST_F(GDataWapiOperationsTest, GetResourceEntryOperation_InvalidResourceId) {
test_util::CreateCopyResultCallback(&result_code, &result_data)));
operation->Start(kTestGDataAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_NOT_FOUND, result_code);
EXPECT_EQ(test_server::METHOD_GET, http_request_.method);
@@ -503,7 +503,7 @@ TEST_F(GDataWapiOperationsTest, GetAccountMetadataOperation) {
true); // Include installed apps.
operation->Start(kTestGDataAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, result_code);
EXPECT_EQ(test_server::METHOD_GET, http_request_.method);
@@ -543,7 +543,7 @@ TEST_F(GDataWapiOperationsTest,
false); // Exclude installed apps.
operation->Start(kTestGDataAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, result_code);
EXPECT_EQ(test_server::METHOD_GET, http_request_.method);
@@ -580,7 +580,7 @@ TEST_F(GDataWapiOperationsTest, DeleteResourceOperation) {
operation->Start(kTestGDataAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, result_code);
EXPECT_EQ(test_server::METHOD_DELETE, http_request_.method);
@@ -606,7 +606,7 @@ TEST_F(GDataWapiOperationsTest, DeleteResourceOperationWithETag) {
operation->Start(kTestGDataAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, result_code);
EXPECT_EQ(test_server::METHOD_DELETE, http_request_.method);
@@ -634,7 +634,7 @@ TEST_F(GDataWapiOperationsTest, CreateDirectoryOperation) {
operation->Start(kTestGDataAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, result_code);
EXPECT_EQ(test_server::METHOD_POST, http_request_.method);
@@ -670,7 +670,7 @@ TEST_F(GDataWapiOperationsTest, CopyHostedDocumentOperation) {
operation->Start(kTestGDataAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, result_code);
EXPECT_EQ(test_server::METHOD_POST, http_request_.method);
@@ -703,7 +703,7 @@ TEST_F(GDataWapiOperationsTest, RenameResourceOperation) {
operation->Start(kTestGDataAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, result_code);
EXPECT_EQ(test_server::METHOD_PUT, http_request_.method);
@@ -739,7 +739,7 @@ TEST_F(GDataWapiOperationsTest, AuthorizeAppOperation_ValidFeed) {
operation->Start(kTestGDataAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, result_code);
EXPECT_EQ(test_server::METHOD_PUT, http_request_.method);
@@ -775,7 +775,7 @@ TEST_F(GDataWapiOperationsTest, AuthorizeAppOperation_InvalidFeed) {
operation->Start(kTestGDataAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(GDATA_PARSE_ERROR, result_code);
EXPECT_EQ(test_server::METHOD_PUT, http_request_.method);
@@ -811,7 +811,7 @@ TEST_F(GDataWapiOperationsTest, AddResourceToDirectoryOperation) {
operation->Start(kTestGDataAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, result_code);
EXPECT_EQ(test_server::METHOD_POST, http_request_.method);
@@ -846,7 +846,7 @@ TEST_F(GDataWapiOperationsTest, RemoveResourceFromDirectoryOperation) {
operation->Start(kTestGDataAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, result_code);
// DELETE method should be used, without the body content.
@@ -883,7 +883,7 @@ TEST_F(GDataWapiOperationsTest, UploadNewFile) {
initiate_operation->Start(
kTestGDataAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, result_code);
EXPECT_EQ(test_server_.GetURL("/upload_new_file"), upload_url);
@@ -931,7 +931,7 @@ TEST_F(GDataWapiOperationsTest, UploadNewFile) {
resume_operation->Start(
kTestGDataAuthToken, 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);
@@ -985,7 +985,7 @@ TEST_F(GDataWapiOperationsTest, UploadNewLargeFile) {
initiate_operation->Start(
kTestGDataAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, result_code);
EXPECT_EQ(test_server_.GetURL("/upload_new_file"), upload_url);
@@ -1030,7 +1030,7 @@ TEST_F(GDataWapiOperationsTest, UploadNewLargeFile) {
get_upload_status_operation->Start(
kTestGDataAuthToken, 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);
@@ -1086,7 +1086,7 @@ TEST_F(GDataWapiOperationsTest, UploadNewLargeFile) {
resume_operation->Start(
kTestGDataAuthToken, 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);
@@ -1133,7 +1133,7 @@ TEST_F(GDataWapiOperationsTest, UploadNewLargeFile) {
get_upload_status_operation->Start(
kTestGDataAuthToken, 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);
@@ -1183,7 +1183,7 @@ TEST_F(GDataWapiOperationsTest, UploadNewEmptyFile) {
initiate_operation->Start(
kTestGDataAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, result_code);
EXPECT_EQ(test_server_.GetURL("/upload_new_file"), upload_url);
@@ -1231,7 +1231,7 @@ TEST_F(GDataWapiOperationsTest, UploadNewEmptyFile) {
resume_operation->Start(
kTestGDataAuthToken, 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);
@@ -1276,7 +1276,7 @@ TEST_F(GDataWapiOperationsTest, UploadExistingFile) {
initiate_operation->Start(
kTestGDataAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, result_code);
EXPECT_EQ(test_server_.GetURL("/upload_existing_file"), upload_url);
@@ -1323,7 +1323,7 @@ TEST_F(GDataWapiOperationsTest, UploadExistingFile) {
resume_operation->Start(
kTestGDataAuthToken, 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);
@@ -1370,7 +1370,7 @@ TEST_F(GDataWapiOperationsTest, UploadExistingFileWithETag) {
initiate_operation->Start(
kTestGDataAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_SUCCESS, result_code);
EXPECT_EQ(test_server_.GetURL("/upload_existing_file"), upload_url);
@@ -1417,7 +1417,7 @@ TEST_F(GDataWapiOperationsTest, UploadExistingFileWithETag) {
resume_operation->Start(
kTestGDataAuthToken, 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);
@@ -1464,7 +1464,7 @@ TEST_F(GDataWapiOperationsTest, UploadExistingFileWithETagConflict) {
initiate_operation->Start(
kTestGDataAuthToken, kTestUserAgent,
base::Bind(&test_util::DoNothingForReAuthenticateCallback));
- MessageLoop::current()->Run();
+ base::MessageLoop::current()->Run();
EXPECT_EQ(HTTP_PRECONDITION, result_code);
// For updating an existing file, METHOD_PUT should be used.
« chrome/browser/extensions/external_policy_loader_unittest.cc ('K') | « chrome/browser/google_apis/fake_drive_service_unittest.cc ('k') | chrome/browser/google_apis/operation_registry_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698