Refactor TrashResourceRequest.

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 38f9d4b7f293d1614488447b909942c2e0fe00a1..bb9c15db90c532a7259f64b4559958cd9f85ef01 100644
--- a/chrome/browser/google_apis/drive_api_requests.cc
+++ b/chrome/browser/google_apis/drive_api_requests.cc
@@ -326,6 +326,28 @@ GURL FilesListRequest::GetURL() const {
   return url_generator_.GetFilesListUrl(max_results_, page_token_, q_);
 }
 
+//============================ FilesTrashRequest =============================
+
+FilesTrashRequest::FilesTrashRequest(
+    RequestSender* sender,
+    const DriveApiUrlGenerator& url_generator,
+    const FileResourceCallback& callback)
+    : GetDataRequest(sender,
+                     base::Bind(&ParseJsonAndRun<FileResource>, callback)),
+      url_generator_(url_generator) {
+  DCHECK(!callback.is_null());
+}
+
+FilesTrashRequest::~FilesTrashRequest() {}
+
+net::URLFetcher::RequestType FilesTrashRequest::GetRequestType() const {
+  return net::URLFetcher::POST;
+}
+
+GURL FilesTrashRequest::GetURL() const {
+  return url_generator_.GetFilesTrashUrl(file_id_);
+}
+
 //============================== AboutGetRequest =============================
 
 AboutGetRequest::AboutGetRequest(
@@ -518,29 +540,6 @@ bool MoveResourceRequest::GetContentData(std::string* upload_content_type,
   return true;
 }
 
-//=========================== TrashResourceRequest ===========================
-
-TrashResourceRequest::TrashResourceRequest(
-    RequestSender* sender,
-    const DriveApiUrlGenerator& url_generator,
-    const std::string& resource_id,
-    const EntryActionCallback& callback)
-    : EntryActionRequest(sender, callback),
-      url_generator_(url_generator),
-      resource_id_(resource_id) {
-  DCHECK(!callback.is_null());
-}
-
-TrashResourceRequest::~TrashResourceRequest() {}
-
-GURL TrashResourceRequest::GetURL() const {
-  return url_generator_.GetFileTrashUrl(resource_id_);
-}
-
-net::URLFetcher::RequestType TrashResourceRequest::GetRequestType() const {
-  return net::URLFetcher::POST;
-}
-
 //========================== InsertResourceRequest ===========================
 
 InsertResourceRequest::InsertResourceRequest(