Index: chrome/browser/google_apis/drive_api_operations.cc |
diff --git a/chrome/browser/google_apis/drive_api_operations.cc b/chrome/browser/google_apis/drive_api_operations.cc |
index ce938d4f859337b66a54a0f884c43c0852864a5a..029e6055fc21bdf2da632c75a5b8ac23b356e23c 100644 |
--- a/chrome/browser/google_apis/drive_api_operations.cc |
+++ b/chrome/browser/google_apis/drive_api_operations.cc |
@@ -76,11 +76,11 @@ void ParseFileResourceWithUploadRangeAndRun( |
//============================== GetAboutOperation ============================= |
GetAboutOperation::GetAboutOperation( |
- OperationRegistry* registry, |
+ OperationRunner* runner, |
net::URLRequestContextGetter* url_request_context_getter, |
const DriveApiUrlGenerator& url_generator, |
const GetAboutResourceCallback& callback) |
- : GetDataOperation(registry, url_request_context_getter, |
+ : GetDataOperation(runner, url_request_context_getter, |
base::Bind(&ParseJsonAndRun<AboutResource>, callback)), |
url_generator_(url_generator) { |
DCHECK(!callback.is_null()); |
@@ -95,11 +95,11 @@ GURL GetAboutOperation::GetURL() const { |
//============================== GetApplistOperation =========================== |
GetApplistOperation::GetApplistOperation( |
- OperationRegistry* registry, |
+ OperationRunner* runner, |
net::URLRequestContextGetter* url_request_context_getter, |
const DriveApiUrlGenerator& url_generator, |
const GetDataCallback& callback) |
- : GetDataOperation(registry, url_request_context_getter, callback), |
+ : GetDataOperation(runner, url_request_context_getter, callback), |
url_generator_(url_generator) { |
DCHECK(!callback.is_null()); |
} |
@@ -113,14 +113,14 @@ GURL GetApplistOperation::GetURL() const { |
//============================ GetChangelistOperation ========================== |
GetChangelistOperation::GetChangelistOperation( |
- OperationRegistry* registry, |
+ OperationRunner* runner, |
net::URLRequestContextGetter* url_request_context_getter, |
const DriveApiUrlGenerator& url_generator, |
bool include_deleted, |
int64 start_changestamp, |
int max_results, |
const GetDataCallback& callback) |
- : GetDataOperation(registry, url_request_context_getter, callback), |
+ : GetDataOperation(runner, url_request_context_getter, callback), |
url_generator_(url_generator), |
include_deleted_(include_deleted), |
start_changestamp_(start_changestamp), |
@@ -138,13 +138,13 @@ GURL GetChangelistOperation::GetURL() const { |
//============================= GetFilelistOperation =========================== |
GetFilelistOperation::GetFilelistOperation( |
- OperationRegistry* registry, |
+ OperationRunner* runner, |
net::URLRequestContextGetter* url_request_context_getter, |
const DriveApiUrlGenerator& url_generator, |
const std::string& search_string, |
int max_results, |
const GetDataCallback& callback) |
- : GetDataOperation(registry, url_request_context_getter, callback), |
+ : GetDataOperation(runner, url_request_context_getter, callback), |
url_generator_(url_generator), |
search_string_(search_string), |
max_results_(max_results) { |
@@ -160,12 +160,12 @@ GURL GetFilelistOperation::GetURL() const { |
//=============================== GetFileOperation ============================= |
GetFileOperation::GetFileOperation( |
- OperationRegistry* registry, |
+ OperationRunner* runner, |
net::URLRequestContextGetter* url_request_context_getter, |
const DriveApiUrlGenerator& url_generator, |
const std::string& file_id, |
const FileResourceCallback& callback) |
- : GetDataOperation(registry, url_request_context_getter, |
+ : GetDataOperation(runner, url_request_context_getter, |
base::Bind(&ParseJsonAndRun<FileResource>, callback)), |
url_generator_(url_generator), |
file_id_(file_id) { |
@@ -183,11 +183,11 @@ namespace drive { |
//======================= ContinueGetFileListOperation ========================= |
ContinueGetFileListOperation::ContinueGetFileListOperation( |
- OperationRegistry* registry, |
+ OperationRunner* runner, |
net::URLRequestContextGetter* url_request_context_getter, |
const GURL& url, |
const GetDataCallback& callback) |
- : GetDataOperation(registry, url_request_context_getter, callback), |
+ : GetDataOperation(runner, url_request_context_getter, callback), |
url_(url) { |
DCHECK(!callback.is_null()); |
} |
@@ -201,13 +201,13 @@ GURL ContinueGetFileListOperation::GetURL() const { |
//========================== CreateDirectoryOperation ========================== |
CreateDirectoryOperation::CreateDirectoryOperation( |
- OperationRegistry* registry, |
+ OperationRunner* runner, |
net::URLRequestContextGetter* url_request_context_getter, |
const DriveApiUrlGenerator& url_generator, |
const std::string& parent_resource_id, |
const std::string& directory_name, |
const FileResourceCallback& callback) |
- : GetDataOperation(registry, url_request_context_getter, |
+ : GetDataOperation(runner, url_request_context_getter, |
base::Bind(&ParseJsonAndRun<FileResource>, callback)), |
url_generator_(url_generator), |
parent_resource_id_(parent_resource_id), |
@@ -252,13 +252,13 @@ bool CreateDirectoryOperation::GetContentData(std::string* upload_content_type, |
//=========================== RenameResourceOperation ========================== |
RenameResourceOperation::RenameResourceOperation( |
- OperationRegistry* registry, |
+ OperationRunner* runner, |
net::URLRequestContextGetter* url_request_context_getter, |
const DriveApiUrlGenerator& url_generator, |
const std::string& resource_id, |
const std::string& new_name, |
const EntryActionCallback& callback) |
- : EntryActionOperation(registry, url_request_context_getter, callback), |
+ : EntryActionOperation(runner, url_request_context_getter, callback), |
url_generator_(url_generator), |
resource_id_(resource_id), |
new_name_(new_name) { |
@@ -298,14 +298,14 @@ bool RenameResourceOperation::GetContentData(std::string* upload_content_type, |
//=========================== CopyResourceOperation ============================ |
CopyResourceOperation::CopyResourceOperation( |
- OperationRegistry* registry, |
+ OperationRunner* runner, |
net::URLRequestContextGetter* url_request_context_getter, |
const DriveApiUrlGenerator& url_generator, |
const std::string& resource_id, |
const std::string& parent_resource_id, |
const std::string& new_name, |
const FileResourceCallback& callback) |
- : GetDataOperation(registry, url_request_context_getter, |
+ : GetDataOperation(runner, url_request_context_getter, |
base::Bind(&ParseJsonAndRun<FileResource>, callback)), |
url_generator_(url_generator), |
resource_id_(resource_id), |
@@ -351,12 +351,12 @@ bool CopyResourceOperation::GetContentData(std::string* upload_content_type, |
//=========================== TrashResourceOperation =========================== |
TrashResourceOperation::TrashResourceOperation( |
- OperationRegistry* registry, |
+ OperationRunner* runner, |
net::URLRequestContextGetter* url_request_context_getter, |
const DriveApiUrlGenerator& url_generator, |
const std::string& resource_id, |
const EntryActionCallback& callback) |
- : EntryActionOperation(registry, url_request_context_getter, callback), |
+ : EntryActionOperation(runner, url_request_context_getter, callback), |
url_generator_(url_generator), |
resource_id_(resource_id) { |
DCHECK(!callback.is_null()); |
@@ -375,13 +375,13 @@ net::URLFetcher::RequestType TrashResourceOperation::GetRequestType() const { |
//========================== InsertResourceOperation =========================== |
InsertResourceOperation::InsertResourceOperation( |
- OperationRegistry* registry, |
+ OperationRunner* runner, |
net::URLRequestContextGetter* url_request_context_getter, |
const DriveApiUrlGenerator& url_generator, |
const std::string& parent_resource_id, |
const std::string& resource_id, |
const EntryActionCallback& callback) |
- : EntryActionOperation(registry, url_request_context_getter, callback), |
+ : EntryActionOperation(runner, url_request_context_getter, callback), |
url_generator_(url_generator), |
parent_resource_id_(parent_resource_id), |
resource_id_(resource_id) { |
@@ -414,13 +414,13 @@ bool InsertResourceOperation::GetContentData(std::string* upload_content_type, |
//========================== DeleteResourceOperation =========================== |
DeleteResourceOperation::DeleteResourceOperation( |
- OperationRegistry* registry, |
+ OperationRunner* runner, |
net::URLRequestContextGetter* url_request_context_getter, |
const DriveApiUrlGenerator& url_generator, |
const std::string& parent_resource_id, |
const std::string& resource_id, |
const EntryActionCallback& callback) |
- : EntryActionOperation(registry, url_request_context_getter, callback), |
+ : EntryActionOperation(runner, url_request_context_getter, callback), |
url_generator_(url_generator), |
parent_resource_id_(parent_resource_id), |
resource_id_(resource_id) { |
@@ -441,7 +441,7 @@ net::URLFetcher::RequestType DeleteResourceOperation::GetRequestType() const { |
//======================= InitiateUploadNewFileOperation ======================= |
InitiateUploadNewFileOperation::InitiateUploadNewFileOperation( |
- OperationRegistry* registry, |
+ OperationRunner* runner, |
net::URLRequestContextGetter* url_request_context_getter, |
const DriveApiUrlGenerator& url_generator, |
const base::FilePath& drive_file_path, |
@@ -450,7 +450,7 @@ InitiateUploadNewFileOperation::InitiateUploadNewFileOperation( |
const std::string& parent_resource_id, |
const std::string& title, |
const InitiateUploadCallback& callback) |
- : InitiateUploadOperationBase(registry, |
+ : InitiateUploadOperationBase(runner, |
url_request_context_getter, |
callback, |
drive_file_path, |
@@ -502,7 +502,7 @@ bool InitiateUploadNewFileOperation::GetContentData( |
//===================== InitiateUploadExistingFileOperation ==================== |
InitiateUploadExistingFileOperation::InitiateUploadExistingFileOperation( |
- OperationRegistry* registry, |
+ OperationRunner* runner, |
net::URLRequestContextGetter* url_request_context_getter, |
const DriveApiUrlGenerator& url_generator, |
const base::FilePath& drive_file_path, |
@@ -511,7 +511,7 @@ InitiateUploadExistingFileOperation::InitiateUploadExistingFileOperation( |
const std::string& resource_id, |
const std::string& etag, |
const InitiateUploadCallback& callback) |
- : InitiateUploadOperationBase(registry, |
+ : InitiateUploadOperationBase(runner, |
url_request_context_getter, |
callback, |
drive_file_path, |
@@ -544,7 +544,7 @@ InitiateUploadExistingFileOperation::GetExtraRequestHeaders() const { |
//============================ ResumeUploadOperation =========================== |
ResumeUploadOperation::ResumeUploadOperation( |
- OperationRegistry* registry, |
+ OperationRunner* runner, |
net::URLRequestContextGetter* url_request_context_getter, |
const base::FilePath& drive_file_path, |
const GURL& upload_location, |
@@ -555,7 +555,7 @@ ResumeUploadOperation::ResumeUploadOperation( |
const base::FilePath& local_file_path, |
const UploadRangeCallback& callback, |
const ProgressCallback& progress_callback) |
- : ResumeUploadOperationBase(registry, |
+ : ResumeUploadOperationBase(runner, |
url_request_context_getter, |
drive_file_path, |
upload_location, |
@@ -585,13 +585,13 @@ void ResumeUploadOperation::OnURLFetchUploadProgress( |
//========================== GetUploadStatusOperation ========================== |
GetUploadStatusOperation::GetUploadStatusOperation( |
- OperationRegistry* registry, |
+ OperationRunner* runner, |
net::URLRequestContextGetter* url_request_context_getter, |
const base::FilePath& drive_file_path, |
const GURL& upload_url, |
int64 content_length, |
const UploadRangeCallback& callback) |
- : GetUploadStatusOperationBase(registry, |
+ : GetUploadStatusOperationBase(runner, |
url_request_context_getter, |
drive_file_path, |
upload_url, |