Refactor TrashResourceRequest.

chrome/browser/google_apis/drive_api_requests.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_requests.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/json/json_writer.h"
 #include "base/location.h"
@@ skipping 308 matching lines @@
       max_results_(100) {
   DCHECK(!callback.is_null());
 }
 
 FilesListRequest::~FilesListRequest() {}
 
 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(
     RequestSender* sender,
     const DriveApiUrlGenerator& url_generator,
     const AboutResourceCallback& callback)
     : GetDataRequest(sender,
                      base::Bind(&ParseJsonAndRun<AboutResource>, callback)),
       url_generator_(url_generator) {
   DCHECK(!callback.is_null());
@@ skipping 172 matching lines @@
     parent_value->SetString("id", parent_resource_id_);
   }
 
   base::JSONWriter::Write(&root, upload_content);
 
   DVLOG(1) << "MoveResource data: " << *upload_content_type << ", ["
            << *upload_content << "]";
   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(
     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),
@@ skipping 225 matching lines @@
           progress_callback,
           url_generator.GenerateDownloadFileUrl(resource_id),
           output_file_path) {
 }
 
 DownloadFileRequest::~DownloadFileRequest() {
 }
 
 }  // namespace drive
 }  // namespace google_apis