Refactor TrashResourceRequest.

chrome/browser/google_apis/drive_api_requests.h

 // 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.
 
 #ifndef CHROME_BROWSER_GOOGLE_APIS_DRIVE_API_REQUESTS_H_
 #define CHROME_BROWSER_GOOGLE_APIS_DRIVE_API_REQUESTS_H_
 
 #include <string>
 
 #include "base/callback_forward.h"
@@ skipping 240 matching lines @@
 
  private:
   const DriveApiUrlGenerator url_generator_;
   int max_results_;
   std::string page_token_;
   std::string q_;
 
   DISALLOW_COPY_AND_ASSIGN(FilesListRequest);
 };
 
+//=========================== TrashResourceRequest ===========================
+
+// This class performs the request for trashing a resource.
+// This request is mapped to
+// https://developers.google.com/drive/v2/reference/files/trash
+class FilesTrashRequest : public GetDataRequest {
+ public:
+  FilesTrashRequest(RequestSender* sender,
+                    const DriveApiUrlGenerator& url_generator,
+                    const FileResourceCallback& callback);
+  virtual ~FilesTrashRequest();
+
+  // Required parameter.
+  const std::string& file_id() const { return file_id_; }
+  void set_file_id(const std::string& file_id) { file_id_ = file_id; }
+
+ protected:
+  // UrlFetchRequestBase overrides.
+  virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
+  virtual GURL GetURL() const OVERRIDE;
+
+ private:
+  const DriveApiUrlGenerator url_generator_;
+  std::string file_id_;
+
+  DISALLOW_COPY_AND_ASSIGN(FilesTrashRequest);
+};
+
+
 //============================== AboutGetRequest =============================
 
 // This class performs the request for fetching About data.
 // This request is mapped to
 // https://developers.google.com/drive/v2/reference/about/get
 class AboutGetRequest : public GetDataRequest {
  public:
   AboutGetRequest(RequestSender* sender,
                   const DriveApiUrlGenerator& url_generator,
                   const AboutResourceCallback& callback);
@@ skipping 163 matching lines @@
                               std::string* upload_content) OVERRIDE;
  private:
   const DriveApiUrlGenerator url_generator_;
   const std::string resource_id_;
   const std::string parent_resource_id_;
   const std::string new_title_;
 
   DISALLOW_COPY_AND_ASSIGN(MoveResourceRequest);
 };
 
-//=========================== TrashResourceRequest ===========================
-
-// This class performs the request for trashing a resource.
-//
-// According to the document:
-// https://developers.google.com/drive/v2/reference/files/trash
-// the file resource will be returned from the server, which is not in the
-// response from WAPI server. For the transition, we simply ignore the result,
-// because now we do not handle resources in trash.
-// Note for the naming: the name "trash" comes from the server's request
-// name. In order to be consistent with the server, we chose "trash" here,
-// although we are preferring the term "remove" in drive/google_api code.
-// TODO(hidehiko): Replace the base class to GetDataRequest.
-class TrashResourceRequest : public EntryActionRequest {
- public:
-  // |callback| must not be null.
-  TrashResourceRequest(RequestSender* sender,
-                       const DriveApiUrlGenerator& url_generator,
-                       const std::string& resource_id,
-                       const EntryActionCallback& callback);
-  virtual ~TrashResourceRequest();
-
- protected:
-  // UrlFetchRequestBase overrides.
-  virtual GURL GetURL() const OVERRIDE;
-  virtual net::URLFetcher::RequestType GetRequestType() const OVERRIDE;
-
- private:
-  const DriveApiUrlGenerator url_generator_;
-  const std::string resource_id_;
-
-  DISALLOW_COPY_AND_ASSIGN(TrashResourceRequest);
-};
-
 //========================== InsertResourceRequest ===========================
 
 // This class performs the request for inserting a resource to a directory.
 // Note that this is the request of "Children: insert" of the Drive API v2.
 // https://developers.google.com/drive/v2/reference/children/insert.
 class InsertResourceRequest : public EntryActionRequest {
  public:
   // |callback| must not be null.
   InsertResourceRequest(RequestSender* sender,
                         const DriveApiUrlGenerator& url_generator,
@@ skipping 195 matching lines @@
                       const ProgressCallback& progress_callback);
   virtual ~DownloadFileRequest();
 
   DISALLOW_COPY_AND_ASSIGN(DownloadFileRequest);
 };
 
 }  // namespace drive
 }  // namespace google_apis
 
 #endif  // CHROME_BROWSER_GOOGLE_APIS_DRIVE_API_REQUESTS_H_