google_apis: Rename base_operations.h/cc to base_requests.h/cc

chrome/browser/google_apis/drive_api_operations.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/google_apis/drive_api_operations.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/json/json_writer.h"
 #include "base/values.h"
@@ skipping 63 matching lines @@
 
 }  // namespace
 
 //============================== GetAboutOperation =============================
 
 GetAboutOperation::GetAboutOperation(
     OperationRunner* runner,
     net::URLRequestContextGetter* url_request_context_getter,
     const DriveApiUrlGenerator& url_generator,
     const GetAboutResourceCallback& callback)
-    : GetDataOperation(runner, url_request_context_getter,
-                       base::Bind(&ParseJsonAndRun<AboutResource>, callback)),
+    : GetDataRequest(runner, url_request_context_getter,
+                     base::Bind(&ParseJsonAndRun<AboutResource>, callback)),
       url_generator_(url_generator) {
   DCHECK(!callback.is_null());
 }
 
 GetAboutOperation::~GetAboutOperation() {}
 
 GURL GetAboutOperation::GetURL() const {
   return url_generator_.GetAboutUrl();
 }
 
 //============================== GetApplistOperation ===========================
 
 GetApplistOperation::GetApplistOperation(
     OperationRunner* runner,
     net::URLRequestContextGetter* url_request_context_getter,
     const DriveApiUrlGenerator& url_generator,
     const GetDataCallback& callback)
-    : GetDataOperation(runner, url_request_context_getter, callback),
+    : GetDataRequest(runner, url_request_context_getter, callback),
       url_generator_(url_generator) {
   DCHECK(!callback.is_null());
 }
 
 GetApplistOperation::~GetApplistOperation() {}
 
 GURL GetApplistOperation::GetURL() const {
   return url_generator_.GetApplistUrl();
 }
 
 //============================ GetChangelistOperation ==========================
 
 GetChangelistOperation::GetChangelistOperation(
     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(runner, url_request_context_getter, callback),
+    : GetDataRequest(runner, url_request_context_getter, callback),
       url_generator_(url_generator),
       include_deleted_(include_deleted),
       start_changestamp_(start_changestamp),
       max_results_(max_results) {
   DCHECK(!callback.is_null());
 }
 
 GetChangelistOperation::~GetChangelistOperation() {}
 
 GURL GetChangelistOperation::GetURL() const {
   return url_generator_.GetChangelistUrl(
       include_deleted_, start_changestamp_, max_results_);
 }
 
 //============================= GetFilelistOperation ===========================
 
 GetFilelistOperation::GetFilelistOperation(
     OperationRunner* runner,
     net::URLRequestContextGetter* url_request_context_getter,
     const DriveApiUrlGenerator& url_generator,
     const std::string& search_string,
     int max_results,
     const GetDataCallback& callback)
-    : GetDataOperation(runner, url_request_context_getter, callback),
+    : GetDataRequest(runner, url_request_context_getter, callback),
       url_generator_(url_generator),
       search_string_(search_string),
       max_results_(max_results) {
   DCHECK(!callback.is_null());
 }
 
 GetFilelistOperation::~GetFilelistOperation() {}
 
 GURL GetFilelistOperation::GetURL() const {
   return url_generator_.GetFilelistUrl(search_string_, max_results_);
 }
 
 //=============================== GetFileOperation =============================
 
 GetFileOperation::GetFileOperation(
     OperationRunner* runner,
     net::URLRequestContextGetter* url_request_context_getter,
     const DriveApiUrlGenerator& url_generator,
     const std::string& file_id,
     const FileResourceCallback& callback)
-    : GetDataOperation(runner, url_request_context_getter,
-                       base::Bind(&ParseJsonAndRun<FileResource>, callback)),
+    : GetDataRequest(runner, url_request_context_getter,
+                     base::Bind(&ParseJsonAndRun<FileResource>, callback)),
       url_generator_(url_generator),
       file_id_(file_id) {
   DCHECK(!callback.is_null());
 }
 
 GetFileOperation::~GetFileOperation() {}
 
 GURL GetFileOperation::GetURL() const {
   return url_generator_.GetFileUrl(file_id_);
 }
 
 namespace drive {
 
 //======================= ContinueGetFileListOperation =========================
 
 ContinueGetFileListOperation::ContinueGetFileListOperation(
     OperationRunner* runner,
     net::URLRequestContextGetter* url_request_context_getter,
     const GURL& url,
     const GetDataCallback& callback)
-    : GetDataOperation(runner, url_request_context_getter, callback),
+    : GetDataRequest(runner, url_request_context_getter, callback),
       url_(url) {
   DCHECK(!callback.is_null());
 }
 
 ContinueGetFileListOperation::~ContinueGetFileListOperation() {}
 
 GURL ContinueGetFileListOperation::GetURL() const {
   return url_;
 }
 
 //========================== CreateDirectoryOperation ==========================
 
 CreateDirectoryOperation::CreateDirectoryOperation(
     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(runner, url_request_context_getter,
-                       base::Bind(&ParseJsonAndRun<FileResource>, callback)),
+    : GetDataRequest(runner, url_request_context_getter,
+                     base::Bind(&ParseJsonAndRun<FileResource>, callback)),
       url_generator_(url_generator),
       parent_resource_id_(parent_resource_id),
       directory_name_(directory_name) {
   DCHECK(!callback.is_null());
   DCHECK(!parent_resource_id_.empty());
   DCHECK(!directory_name_.empty());
 }
 
 CreateDirectoryOperation::~CreateDirectoryOperation() {}
 
@@ skipping 29 matching lines @@
 
 //=========================== RenameResourceOperation ==========================
 
 RenameResourceOperation::RenameResourceOperation(
     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(runner, url_request_context_getter, callback),
+    : EntryActionRequest(runner, url_request_context_getter, callback),
       url_generator_(url_generator),
       resource_id_(resource_id),
       new_name_(new_name) {
   DCHECK(!callback.is_null());
 }
 
 RenameResourceOperation::~RenameResourceOperation() {}
 
 net::URLFetcher::RequestType RenameResourceOperation::GetRequestType() const {
   return net::URLFetcher::PATCH;
@@ skipping 26 matching lines @@
 //=========================== TouchResourceOperation ===========================
 
 TouchResourceOperation::TouchResourceOperation(
     OperationRunner* runner,
     net::URLRequestContextGetter* url_request_context_getter,
     const DriveApiUrlGenerator& url_generator,
     const std::string& resource_id,
     const base::Time& modified_date,
     const base::Time& last_viewed_by_me_date,
     const FileResourceCallback& callback)
-    : GetDataOperation(runner, url_request_context_getter,
-                       base::Bind(&ParseJsonAndRun<FileResource>, callback)),
+    : GetDataRequest(runner, url_request_context_getter,
+                     base::Bind(&ParseJsonAndRun<FileResource>, callback)),
       url_generator_(url_generator),
       resource_id_(resource_id),
       modified_date_(modified_date),
       last_viewed_by_me_date_(last_viewed_by_me_date) {
   DCHECK(!modified_date.is_null());
   DCHECK(!last_viewed_by_me_date.is_null());
   DCHECK(!callback.is_null());
 }
 
 TouchResourceOperation::~TouchResourceOperation() {}
@@ skipping 31 matching lines @@
 //=========================== CopyResourceOperation ============================
 
 CopyResourceOperation::CopyResourceOperation(
     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(runner, url_request_context_getter,
-                       base::Bind(&ParseJsonAndRun<FileResource>, callback)),
+    : GetDataRequest(runner, url_request_context_getter,
+                     base::Bind(&ParseJsonAndRun<FileResource>, callback)),
       url_generator_(url_generator),
       resource_id_(resource_id),
       parent_resource_id_(parent_resource_id),
       new_name_(new_name) {
   DCHECK(!callback.is_null());
 }
 
 CopyResourceOperation::~CopyResourceOperation() {
 }
 
@@ skipping 29 matching lines @@
 }
 
 //=========================== TrashResourceOperation ===========================
 
 TrashResourceOperation::TrashResourceOperation(
     OperationRunner* runner,
     net::URLRequestContextGetter* url_request_context_getter,
     const DriveApiUrlGenerator& url_generator,
     const std::string& resource_id,
     const EntryActionCallback& callback)
-    : EntryActionOperation(runner, url_request_context_getter, callback),
+    : EntryActionRequest(runner, url_request_context_getter, callback),
       url_generator_(url_generator),
       resource_id_(resource_id) {
   DCHECK(!callback.is_null());
 }
 
 TrashResourceOperation::~TrashResourceOperation() {}
 
 GURL TrashResourceOperation::GetURL() const {
   return url_generator_.GetFileTrashUrl(resource_id_);
 }
 
 net::URLFetcher::RequestType TrashResourceOperation::GetRequestType() const {
   return net::URLFetcher::POST;
 }
 
 //========================== InsertResourceOperation ===========================
 
 InsertResourceOperation::InsertResourceOperation(
     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(runner, url_request_context_getter, callback),
+    : EntryActionRequest(runner, url_request_context_getter, callback),
       url_generator_(url_generator),
       parent_resource_id_(parent_resource_id),
       resource_id_(resource_id) {
   DCHECK(!callback.is_null());
 }
 
 InsertResourceOperation::~InsertResourceOperation() {}
 
 GURL InsertResourceOperation::GetURL() const {
   return url_generator_.GetChildrenUrl(parent_resource_id_);
@@ skipping 18 matching lines @@
 
 //========================== DeleteResourceOperation ===========================
 
 DeleteResourceOperation::DeleteResourceOperation(
     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(runner, url_request_context_getter, callback),
+    : EntryActionRequest(runner, url_request_context_getter, callback),
       url_generator_(url_generator),
       parent_resource_id_(parent_resource_id),
       resource_id_(resource_id) {
   DCHECK(!callback.is_null());
 }
 
 DeleteResourceOperation::~DeleteResourceOperation() {}
 
 GURL DeleteResourceOperation::GetURL() const {
   return url_generator_.GetChildrenUrlForRemoval(
       parent_resource_id_, resource_id_);
 }
 
 net::URLFetcher::RequestType DeleteResourceOperation::GetRequestType() const {
   return net::URLFetcher::DELETE_REQUEST;
 }
 
 //======================= InitiateUploadNewFileOperation =======================
 
 InitiateUploadNewFileOperation::InitiateUploadNewFileOperation(
     OperationRunner* runner,
     net::URLRequestContextGetter* url_request_context_getter,
     const DriveApiUrlGenerator& url_generator,
     const base::FilePath& drive_file_path,
     const std::string& content_type,
     int64 content_length,
     const std::string& parent_resource_id,
     const std::string& title,
     const InitiateUploadCallback& callback)
-    : InitiateUploadOperationBase(runner,
-                                  url_request_context_getter,
-                                  callback,
-                                  drive_file_path,
-                                  content_type,
-                                  content_length),
+    : InitiateUploadRequestBase(runner,
+                                url_request_context_getter,
+                                callback,
+                                drive_file_path,
+                                content_type,
+                                content_length),
       url_generator_(url_generator),
       parent_resource_id_(parent_resource_id),
       title_(title) {
 }
 
 InitiateUploadNewFileOperation::~InitiateUploadNewFileOperation() {}
 
 GURL InitiateUploadNewFileOperation::GetURL() const {
   return url_generator_.GetInitiateUploadNewFileUrl();
 }
@@ skipping 35 matching lines @@
 InitiateUploadExistingFileOperation::InitiateUploadExistingFileOperation(
     OperationRunner* runner,
     net::URLRequestContextGetter* url_request_context_getter,
     const DriveApiUrlGenerator& url_generator,
     const base::FilePath& drive_file_path,
     const std::string& content_type,
     int64 content_length,
     const std::string& resource_id,
     const std::string& etag,
     const InitiateUploadCallback& callback)
-    : InitiateUploadOperationBase(runner,
-                                  url_request_context_getter,
-                                  callback,
-                                  drive_file_path,
-                                  content_type,
-                                  content_length),
+    : InitiateUploadRequestBase(runner,
+                                url_request_context_getter,
+                                callback,
+                                drive_file_path,
+                                content_type,
+                                content_length),
       url_generator_(url_generator),
       resource_id_(resource_id),
       etag_(etag) {
 }
 
 InitiateUploadExistingFileOperation::~InitiateUploadExistingFileOperation() {}
 
 GURL InitiateUploadExistingFileOperation::GetURL() const {
   return url_generator_.GetInitiateUploadExistingFileUrl(resource_id_);
 }
 
 net::URLFetcher::RequestType
 InitiateUploadExistingFileOperation::GetRequestType() const {
   return net::URLFetcher::PUT;
 }
 
 std::vector<std::string>
 InitiateUploadExistingFileOperation::GetExtraRequestHeaders() const {
   std::vector<std::string> headers(
-      InitiateUploadOperationBase::GetExtraRequestHeaders());
+      InitiateUploadRequestBase::GetExtraRequestHeaders());
   headers.push_back(util::GenerateIfMatchHeader(etag_));
   return headers;
 }
 
 //============================ ResumeUploadOperation ===========================
 
 ResumeUploadOperation::ResumeUploadOperation(
     OperationRunner* runner,
     net::URLRequestContextGetter* url_request_context_getter,
     const base::FilePath& drive_file_path,
     const GURL& upload_location,
     int64 start_position,
     int64 end_position,
     int64 content_length,
     const std::string& content_type,
     const base::FilePath& local_file_path,
     const UploadRangeCallback& callback,
     const ProgressCallback& progress_callback)
-    : ResumeUploadOperationBase(runner,
-                                url_request_context_getter,
-                                drive_file_path,
-                                upload_location,
-                                start_position,
-                                end_position,
-                                content_length,
-                                content_type,
-                                local_file_path),
+    : ResumeUploadRequestBase(runner,
+                              url_request_context_getter,
+                              drive_file_path,
+                              upload_location,
+                              start_position,
+                              end_position,
+                              content_length,
+                              content_type,
+                              local_file_path),
       callback_(callback),
       progress_callback_(progress_callback) {
   DCHECK(!callback_.is_null());
 }
 
 ResumeUploadOperation::~ResumeUploadOperation() {}
 
-void ResumeUploadOperation::OnRangeOperationComplete(
+void ResumeUploadOperation::OnRangeRequestComplete(
     const UploadRangeResponse& response, scoped_ptr<base::Value> value) {
   ParseFileResourceWithUploadRangeAndRun(callback_, response, value.Pass());
 }
 
 void ResumeUploadOperation::OnURLFetchUploadProgress(
     const net::URLFetcher* source, int64 current, int64 total) {
   if (!progress_callback_.is_null())
     progress_callback_.Run(current, total);
 }
 
 //========================== GetUploadStatusOperation ==========================
 
 GetUploadStatusOperation::GetUploadStatusOperation(
     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(runner,
+    : GetUploadStatusRequestBase(runner,
                                  url_request_context_getter,
                                  drive_file_path,
                                  upload_url,
                                  content_length),
-    callback_(callback) {
+      callback_(callback) {
   DCHECK(!callback.is_null());
 }
 
 GetUploadStatusOperation::~GetUploadStatusOperation() {}
 
-void GetUploadStatusOperation::OnRangeOperationComplete(
+void GetUploadStatusOperation::OnRangeRequestComplete(
     const UploadRangeResponse& response, scoped_ptr<base::Value> value) {
   ParseFileResourceWithUploadRangeAndRun(callback_, response, value.Pass());
 }
 
 }  // namespace drive
 }  // namespace google_apis