Refactor InsertResourceRequest and DeleteResourceRequest.

chrome/browser/google_apis/drive_api_requests.cc

Index: chrome/browser/google_apis/drive_api_requests.cc
diff --git a/chrome/browser/google_apis/drive_api_requests.cc b/chrome/browser/google_apis/drive_api_requests.cc
index bb9c15db90c532a7259f64b4559958cd9f85ef01..f3de9b042d97fa325acf054e6e8c1ced71f1752d 100644
--- a/chrome/browser/google_apis/drive_api_requests.cc
+++ b/chrome/browser/google_apis/drive_api_requests.cc
@@ -540,68 +540,59 @@ bool MoveResourceRequest::GetContentData(std::string* upload_content_type,
   return true;
 }
 
-//========================== InsertResourceRequest ===========================
+//========================== ChildrenInsertRequest ============================
 
-InsertResourceRequest::InsertResourceRequest(
+ChildrenInsertRequest::ChildrenInsertRequest(
     RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
-    const std::string& parent_resource_id,
-    const std::string& resource_id,
     const EntryActionCallback& callback)
     : EntryActionRequest(sender, callback),
-      url_generator_(url_generator),
-      parent_resource_id_(parent_resource_id),
-      resource_id_(resource_id) {
+      url_generator_(url_generator) {
   DCHECK(!callback.is_null());
 }
 
-InsertResourceRequest::~InsertResourceRequest() {}
+ChildrenInsertRequest::~ChildrenInsertRequest() {}
 
-GURL InsertResourceRequest::GetURL() const {
-  return url_generator_.GetChildrenUrl(parent_resource_id_);
+net::URLFetcher::RequestType ChildrenInsertRequest::GetRequestType() const {
+  return net::URLFetcher::POST;
 }
 
-net::URLFetcher::RequestType InsertResourceRequest::GetRequestType() const {
-  return net::URLFetcher::POST;
+GURL ChildrenInsertRequest::GetURL() const {
+  return url_generator_.GetChildrenInsertUrl(folder_id_);
 }
 
-bool InsertResourceRequest::GetContentData(std::string* upload_content_type,
+bool ChildrenInsertRequest::GetContentData(std::string* upload_content_type,
                                            std::string* upload_content) {
   *upload_content_type = kContentTypeApplicationJson;
 
   base::DictionaryValue root;
-  root.SetString("id", resource_id_);
-  base::JSONWriter::Write(&root, upload_content);
+  root.SetString("id", id_);
 
+  base::JSONWriter::Write(&root, upload_content);
   DVLOG(1) << "InsertResource data: " << *upload_content_type << ", ["
            << *upload_content << "]";
   return true;
 }
 
-//========================== DeleteResourceRequest ===========================
+//========================== ChildrenDeleteRequest ============================
 
-DeleteResourceRequest::DeleteResourceRequest(
+ChildrenDeleteRequest::ChildrenDeleteRequest(
     RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
-    const std::string& parent_resource_id,
-    const std::string& resource_id,
     const EntryActionCallback& callback)
     : EntryActionRequest(sender, callback),
-      url_generator_(url_generator),
-      parent_resource_id_(parent_resource_id),
-      resource_id_(resource_id) {
+      url_generator_(url_generator) {
   DCHECK(!callback.is_null());
 }
 
-DeleteResourceRequest::~DeleteResourceRequest() {}
+ChildrenDeleteRequest::~ChildrenDeleteRequest() {}
 
-GURL DeleteResourceRequest::GetURL() const {
-  return url_generator_.GetChildrenUrlForRemoval(
-      parent_resource_id_, resource_id_);
+net::URLFetcher::RequestType ChildrenDeleteRequest::GetRequestType() const {
+  return net::URLFetcher::DELETE_REQUEST;
 }
 
-net::URLFetcher::RequestType DeleteResourceRequest::GetRequestType() const {
-  return net::URLFetcher::DELETE_REQUEST;
+GURL ChildrenDeleteRequest::GetURL() const {
+  return url_generator_.GetChildrenDeleteUrl(child_id_, folder_id_);
 }
 
 //======================= InitiateUploadNewFileRequest =======================