Refactor TrashResourceRequest.

chrome/browser/google_apis/drive_api_url_generator.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_url_generator.h"
 
 #include "base/logging.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/stringprintf.h"
 #include "net/base/escape.h"
@@ skipping 97 matching lines @@
 
   if (!page_token.empty())
     url = net::AppendOrReplaceQueryParameter(url, "pageToken", page_token);
 
   if (!q.empty())
     url = net::AppendOrReplaceQueryParameter(url, "q", q);
 
   return url;
 }
 
+GURL DriveApiUrlGenerator::GetFilesTrashUrl(const std::string& file_id) const {
+  return base_url_.Resolve(base::StringPrintf(
+      kDriveV2FileTrashUrlFormat, net::EscapePath(file_id).c_str()));
+}
+
 GURL DriveApiUrlGenerator::GetFileTouchUrl(
     const std::string& resource_id) const {
   GURL url = base_url_.Resolve(
       kDriveV2FileUrlPrefix + net::EscapePath(resource_id));
 
   // This parameter is needed to set the modified date.
   url = net::AppendOrReplaceQueryParameter(url, "setModifiedDate", "true");
 
   // This parameter is needed to set the last viewed by me date. Otherwise
   // the current time is set automatically.
   url = net::AppendOrReplaceQueryParameter(url, "updateViewedDate", "false");
 
   return url;
 }
 
-GURL DriveApiUrlGenerator::GetFileTrashUrl(const std::string& file_id) const {
-  return base_url_.Resolve(
-      base::StringPrintf(kDriveV2FileTrashUrlFormat,
-                         net::EscapePath(file_id).c_str()));
-}
-
 GURL DriveApiUrlGenerator::GetChangesListUrl(bool include_deleted,
                                              int max_results,
                                              const std::string& page_token,
                                              int64 start_change_id) const {
   DCHECK_GE(start_change_id, 0);
 
   GURL url = base_url_.Resolve(kDriveV2ChangelistUrl);
 
   // includeDeleted is "true" by default.
   if (!include_deleted)
@@ skipping 42 matching lines @@
       net::EscapePath(resource_id));
   return AddResumableUploadParam(url);
 }
 
 GURL DriveApiUrlGenerator::GenerateDownloadFileUrl(
     const std::string& resource_id) const {
   return base_download_url_.Resolve(net::EscapePath(resource_id));
 }
 
 }  // namespace google_apis