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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/google_apis/fake_drive_service.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/drive_uploader_unittest.cc ('k') | chrome/browser/google_apis/fake_drive_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/google_apis/fake_drive_service.cc
diff --git a/chrome/browser/google_apis/fake_drive_service.cc b/chrome/browser/google_apis/fake_drive_service.cc
index 04cb7be6faa98bfb5b358ec6384dbed3b68a8956..06b170338bc984c5804a1ffde265695c0b687710 100644
--- a/chrome/browser/google_apis/fake_drive_service.cc
+++ b/chrome/browser/google_apis/fake_drive_service.cc
@@ -339,11 +339,9 @@ void FakeDriveService::GetResourceEntry(
if (offline_) {
scoped_ptr<ResourceEntry> null;
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(callback,
- GDATA_NO_CONNECTION,
- base::Passed(&null)));
+ base::Bind(callback, GDATA_NO_CONNECTION, base::Passed(&null)));
return;
}
@@ -351,16 +349,15 @@ void FakeDriveService::GetResourceEntry(
if (entry) {
scoped_ptr<ResourceEntry> resource_entry =
ResourceEntry::CreateFrom(*entry);
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
base::Bind(callback, HTTP_SUCCESS, base::Passed(&resource_entry)));
return;
}
scoped_ptr<ResourceEntry> null;
- MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(callback, HTTP_NOT_FOUND, base::Passed(&null)));
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE, base::Bind(callback, HTTP_NOT_FOUND, base::Passed(&null)));
}
void FakeDriveService::GetAccountMetadata(
@@ -370,11 +367,9 @@ void FakeDriveService::GetAccountMetadata(
if (offline_) {
scoped_ptr<AccountMetadata> null;
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(callback,
- GDATA_NO_CONNECTION,
- base::Passed(&null)));
+ base::Bind(callback, GDATA_NO_CONNECTION, base::Passed(&null)));
return;
}
@@ -383,11 +378,9 @@ void FakeDriveService::GetAccountMetadata(
AccountMetadata::CreateFrom(*account_metadata_value_);
// Overwrite the change stamp.
account_metadata->set_largest_changestamp(largest_changestamp_);
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(callback,
- HTTP_SUCCESS,
- base::Passed(&account_metadata)));
+ base::Bind(callback, HTTP_SUCCESS, base::Passed(&account_metadata)));
}
void FakeDriveService::GetAboutResource(
@@ -400,10 +393,9 @@ void FakeDriveService::GetAboutResource(
if (offline_) {
scoped_ptr<AboutResource> null;
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(callback,
- GDATA_NO_CONNECTION, base::Passed(&null)));
+ base::Bind(callback, GDATA_NO_CONNECTION, base::Passed(&null)));
return;
}
@@ -414,10 +406,9 @@ void FakeDriveService::GetAboutResource(
GetRootResourceId()));
// Overwrite the change id.
about_resource->set_largest_change_id(largest_changestamp_);
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(callback,
- HTTP_SUCCESS, base::Passed(&about_resource)));
+ base::Bind(callback, HTTP_SUCCESS, base::Passed(&about_resource)));
}
void FakeDriveService::GetAppList(const GetAppListCallback& callback) {
@@ -426,18 +417,15 @@ void FakeDriveService::GetAppList(const GetAppListCallback& callback) {
if (offline_) {
scoped_ptr<AppList> null;
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(callback,
- GDATA_NO_CONNECTION,
- base::Passed(&null)));
+ base::Bind(callback, GDATA_NO_CONNECTION, base::Passed(&null)));
return;
}
scoped_ptr<AppList> app_list(AppList::CreateFrom(*app_info_value_));
- MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(callback, HTTP_SUCCESS, base::Passed(&app_list)));
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE, base::Bind(callback, HTTP_SUCCESS, base::Passed(&app_list)));
}
void FakeDriveService::DeleteResource(
@@ -448,7 +436,7 @@ void FakeDriveService::DeleteResource(
DCHECK(!callback.is_null());
if (offline_) {
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(callback, GDATA_NO_CONNECTION));
return;
}
@@ -465,7 +453,7 @@ void FakeDriveService::DeleteResource(
entry->GetString("gd$resourceId.$t", &current_resource_id) &&
resource_id == current_resource_id) {
entries->Remove(i, NULL);
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(callback, HTTP_SUCCESS));
return;
}
@@ -474,8 +462,8 @@ void FakeDriveService::DeleteResource(
// TODO(satorux): Add support for returning "deleted" entries in
// changelists from GetResourceList().
- MessageLoop::current()->PostTask(
- FROM_HERE, base::Bind(callback, HTTP_NOT_FOUND));
+ base::MessageLoop::current()->PostTask(FROM_HERE,
+ base::Bind(callback, HTTP_NOT_FOUND));
}
void FakeDriveService::DownloadFile(
@@ -489,11 +477,10 @@ void FakeDriveService::DownloadFile(
DCHECK(!download_action_callback.is_null());
if (offline_) {
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(download_action_callback,
- GDATA_NO_CONNECTION,
- base::FilePath()));
+ base::Bind(
+ download_action_callback, GDATA_NO_CONNECTION, base::FilePath()));
return;
}
@@ -567,11 +554,9 @@ void FakeDriveService::CopyHostedDocument(
if (offline_) {
scoped_ptr<ResourceEntry> null;
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(callback,
- GDATA_NO_CONNECTION,
- base::Passed(&null)));
+ base::Bind(callback, GDATA_NO_CONNECTION, base::Passed(&null)));
return;
}
@@ -613,11 +598,10 @@ void FakeDriveService::CopyHostedDocument(
// Add it to the resource list.
entries->Append(copied_entry.release());
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(callback,
- HTTP_SUCCESS,
- base::Passed(&resource_entry)));
+ base::Bind(
+ callback, HTTP_SUCCESS, base::Passed(&resource_entry)));
return;
}
}
@@ -626,9 +610,8 @@ void FakeDriveService::CopyHostedDocument(
}
scoped_ptr<ResourceEntry> null;
- MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(callback, HTTP_NOT_FOUND, base::Passed(&null)));
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE, base::Bind(callback, HTTP_NOT_FOUND, base::Passed(&null)));
}
void FakeDriveService::RenameResource(
@@ -639,7 +622,7 @@ void FakeDriveService::RenameResource(
DCHECK(!callback.is_null());
if (offline_) {
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(callback, GDATA_NO_CONNECTION));
return;
}
@@ -648,13 +631,13 @@ void FakeDriveService::RenameResource(
if (entry) {
entry->SetString("title.$t", new_name);
AddNewChangestamp(entry);
- MessageLoop::current()->PostTask(
- FROM_HERE, base::Bind(callback, HTTP_SUCCESS));
+ base::MessageLoop::current()->PostTask(FROM_HERE,
+ base::Bind(callback, HTTP_SUCCESS));
return;
}
- MessageLoop::current()->PostTask(
- FROM_HERE, base::Bind(callback, HTTP_NOT_FOUND));
+ base::MessageLoop::current()->PostTask(FROM_HERE,
+ base::Bind(callback, HTTP_NOT_FOUND));
}
void FakeDriveService::AddResourceToDirectory(
@@ -665,7 +648,7 @@ void FakeDriveService::AddResourceToDirectory(
DCHECK(!callback.is_null());
if (offline_) {
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(callback, GDATA_NO_CONNECTION));
return;
}
@@ -689,13 +672,13 @@ void FakeDriveService::AddResourceToDirectory(
links->Append(link);
AddNewChangestamp(entry);
- MessageLoop::current()->PostTask(
- FROM_HERE, base::Bind(callback, HTTP_SUCCESS));
+ base::MessageLoop::current()->PostTask(FROM_HERE,
+ base::Bind(callback, HTTP_SUCCESS));
return;
}
- MessageLoop::current()->PostTask(
- FROM_HERE, base::Bind(callback, HTTP_NOT_FOUND));
+ base::MessageLoop::current()->PostTask(FROM_HERE,
+ base::Bind(callback, HTTP_NOT_FOUND));
}
void FakeDriveService::RemoveResourceFromDirectory(
@@ -706,7 +689,7 @@ void FakeDriveService::RemoveResourceFromDirectory(
DCHECK(!callback.is_null());
if (offline_) {
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(callback, GDATA_NO_CONNECTION));
return;
}
@@ -727,7 +710,7 @@ void FakeDriveService::RemoveResourceFromDirectory(
GURL(href) == parent_content_url) {
links->Remove(i, NULL);
AddNewChangestamp(entry);
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(callback, HTTP_SUCCESS));
return;
}
@@ -735,8 +718,8 @@ void FakeDriveService::RemoveResourceFromDirectory(
}
}
- MessageLoop::current()->PostTask(
- FROM_HERE, base::Bind(callback, HTTP_NOT_FOUND));
+ base::MessageLoop::current()->PostTask(FROM_HERE,
+ base::Bind(callback, HTTP_NOT_FOUND));
}
void FakeDriveService::AddNewDirectory(
@@ -748,11 +731,9 @@ void FakeDriveService::AddNewDirectory(
if (offline_) {
scoped_ptr<ResourceEntry> null;
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(callback,
- GDATA_NO_CONNECTION,
- base::Passed(&null)));
+ base::Bind(callback, GDATA_NO_CONNECTION, base::Passed(&null)));
return;
}
@@ -765,14 +746,13 @@ void FakeDriveService::AddNewDirectory(
"folder");
if (!new_entry) {
scoped_ptr<ResourceEntry> null;
- MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(callback, HTTP_NOT_FOUND, base::Passed(&null)));
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE, base::Bind(callback, HTTP_NOT_FOUND, base::Passed(&null)));
return;
}
scoped_ptr<ResourceEntry> parsed_entry(ResourceEntry::CreateFrom(*new_entry));
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
base::Bind(callback, HTTP_CREATED, base::Passed(&parsed_entry)));
}
@@ -788,9 +768,8 @@ void FakeDriveService::InitiateUploadNewFile(
DCHECK(!callback.is_null());
if (offline_) {
- MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(callback, GDATA_NO_CONNECTION, GURL()));
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE, base::Bind(callback, GDATA_NO_CONNECTION, GURL()));
return;
}
@@ -803,17 +782,15 @@ void FakeDriveService::InitiateUploadNewFile(
false, // shared_with_me
"file");
if (!new_entry) {
- MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(callback, HTTP_NOT_FOUND, GURL()));
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE, base::Bind(callback, HTTP_NOT_FOUND, GURL()));
return;
}
const GURL upload_url = GetUploadUrl(*new_entry);
DCHECK(upload_url.is_valid());
- MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(callback, HTTP_SUCCESS, upload_url));
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE, base::Bind(callback, HTTP_SUCCESS, upload_url));
}
void FakeDriveService::InitiateUploadExistingFile(
@@ -827,26 +804,23 @@ void FakeDriveService::InitiateUploadExistingFile(
DCHECK(!callback.is_null());
if (offline_) {
- MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(callback, GDATA_NO_CONNECTION, GURL()));
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE, base::Bind(callback, GDATA_NO_CONNECTION, GURL()));
return;
}
DictionaryValue* entry = FindEntryByResourceId(resource_id);
if (!entry) {
- MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(callback, HTTP_NOT_FOUND, GURL()));
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE, base::Bind(callback, HTTP_NOT_FOUND, GURL()));
return;
}
std::string entry_etag;
entry->GetString("gd$etag", &entry_etag);
if (!etag.empty() && etag != entry_etag) {
- MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(callback, HTTP_PRECONDITION, GURL()));
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE, base::Bind(callback, HTTP_PRECONDITION, GURL()));
return;
}
entry->SetString("docs$size.$t", "0");
@@ -854,9 +828,8 @@ void FakeDriveService::InitiateUploadExistingFile(
const GURL upload_url = GetUploadUrl(*entry);
DCHECK(upload_url.is_valid());
- MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(callback, HTTP_SUCCESS, upload_url));
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE, base::Bind(callback, HTTP_SUCCESS, upload_url));
}
void FakeDriveService::GetUploadStatus(
@@ -886,12 +859,11 @@ void FakeDriveService::ResumeUpload(
scoped_ptr<ResourceEntry> result_entry;
if (offline_) {
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
base::Bind(callback,
- UploadRangeResponse(GDATA_NO_CONNECTION,
- start_position,
- end_position),
+ UploadRangeResponse(
+ GDATA_NO_CONNECTION, start_position, end_position),
base::Passed(&result_entry)));
return;
}
@@ -899,13 +871,12 @@ void FakeDriveService::ResumeUpload(
DictionaryValue* entry = NULL;
entry = FindEntryByUploadUrl(upload_url);
if (!entry) {
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(callback,
- UploadRangeResponse(HTTP_NOT_FOUND,
- start_position,
- end_position),
- base::Passed(&result_entry)));
+ base::Bind(
+ callback,
+ UploadRangeResponse(HTTP_NOT_FOUND, start_position, end_position),
+ base::Passed(&result_entry)));
return;
}
@@ -916,13 +887,12 @@ void FakeDriveService::ResumeUpload(
if (!entry->GetString("docs$size.$t", &current_size_string) ||
!base::StringToInt64(current_size_string, &current_size) ||
current_size != start_position) {
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(callback,
- UploadRangeResponse(HTTP_BAD_REQUEST,
- start_position,
- end_position),
- base::Passed(&result_entry)));
+ base::Bind(
+ callback,
+ UploadRangeResponse(HTTP_BAD_REQUEST, start_position, end_position),
+ base::Passed(&result_entry)));
return;
}
@@ -936,20 +906,19 @@ void FakeDriveService::ResumeUpload(
// crucial difference of the progress callback from others.
// Note that progress is notified in the relative offset in each chunk.
const int64 chunk_size = end_position - start_position;
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(progress_callback, chunk_size / 2, chunk_size));
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE, base::Bind(progress_callback, chunk_size, chunk_size));
}
if (content_length != end_position) {
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
base::Bind(callback,
- UploadRangeResponse(HTTP_RESUME_INCOMPLETE,
- start_position,
- end_position),
- base::Passed(&result_entry)));
+ UploadRangeResponse(
+ HTTP_RESUME_INCOMPLETE, start_position, end_position),
+ base::Passed(&result_entry)));
return;
}
@@ -959,12 +928,10 @@ void FakeDriveService::ResumeUpload(
if (upload_mode == UPLOAD_NEW_FILE)
return_code = HTTP_CREATED;
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
base::Bind(callback,
- UploadRangeResponse(return_code,
- start_position,
- end_position),
+ UploadRangeResponse(return_code, start_position, end_position),
base::Passed(&result_entry)));
}
@@ -986,11 +953,9 @@ void FakeDriveService::AddNewFile(const std::string& content_type,
if (offline_) {
scoped_ptr<ResourceEntry> null;
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(callback,
- GDATA_NO_CONNECTION,
- base::Passed(&null)));
+ base::Bind(callback, GDATA_NO_CONNECTION, base::Passed(&null)));
return;
}
@@ -1009,15 +974,14 @@ void FakeDriveService::AddNewFile(const std::string& content_type,
entry_kind);
if (!new_entry) {
scoped_ptr<ResourceEntry> null;
- MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(callback, HTTP_NOT_FOUND, base::Passed(&null)));
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE, base::Bind(callback, HTTP_NOT_FOUND, base::Passed(&null)));
return;
}
scoped_ptr<ResourceEntry> parsed_entry(
ResourceEntry::CreateFrom(*new_entry));
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
base::Bind(callback, HTTP_CREATED, base::Passed(&parsed_entry)));
}
@@ -1031,20 +995,17 @@ void FakeDriveService::SetLastModifiedTime(
if (offline_) {
scoped_ptr<ResourceEntry> null;
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(callback,
- GDATA_NO_CONNECTION,
- base::Passed(&null)));
+ base::Bind(callback, GDATA_NO_CONNECTION, base::Passed(&null)));
return;
}
base::DictionaryValue* entry = FindEntryByResourceId(resource_id);
if (!entry) {
scoped_ptr<ResourceEntry> null;
- MessageLoop::current()->PostTask(
- FROM_HERE,
- base::Bind(callback, HTTP_NOT_FOUND, base::Passed(&null)));
+ base::MessageLoop::current()->PostTask(
+ FROM_HERE, base::Bind(callback, HTTP_NOT_FOUND, base::Passed(&null)));
return;
}
@@ -1052,7 +1013,7 @@ void FakeDriveService::SetLastModifiedTime(
scoped_ptr<ResourceEntry> parsed_entry(
ResourceEntry::CreateFrom(*entry));
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
base::Bind(callback, HTTP_SUCCESS, base::Passed(&parsed_entry)));
}
@@ -1253,11 +1214,9 @@ void FakeDriveService::GetResourceListInternal(
const GetResourceListCallback& callback) {
if (offline_) {
scoped_ptr<ResourceList> null;
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(callback,
- GDATA_NO_CONNECTION,
- base::Passed(&null)));
+ base::Bind(callback, GDATA_NO_CONNECTION, base::Passed(&null)));
return;
}
@@ -1352,11 +1311,9 @@ void FakeDriveService::GetResourceListInternal(
}
++resource_list_load_count_;
- MessageLoop::current()->PostTask(
+ base::MessageLoop::current()->PostTask(
FROM_HERE,
- base::Bind(callback,
- HTTP_SUCCESS,
- base::Passed(&resource_list)));
+ base::Bind(callback, HTTP_SUCCESS, base::Passed(&resource_list)));
}
} // namespace google_apis
« chrome/browser/extensions/external_policy_loader_unittest.cc ('K') | « chrome/browser/google_apis/drive_uploader_unittest.cc ('k') | chrome/browser/google_apis/fake_drive_service_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698