Refactor GetChangelistRequest.

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 47 matching lines @@
     "https://www.googledrive.com/host/";
 
 GURL DriveApiUrlGenerator::GetAboutGetUrl() const {
   return base_url_.Resolve(kDriveV2AboutUrl);
 }
 
 GURL DriveApiUrlGenerator::GetAppsListUrl() const {
   return base_url_.Resolve(kDriveV2AppsUrl);
 }
 
-GURL DriveApiUrlGenerator::GetChangelistUrl(
-    bool include_deleted, int64 start_changestamp, int max_results) const {
-  DCHECK_GE(start_changestamp, 0);
-
-  GURL url = base_url_.Resolve(kDriveV2ChangelistUrl);
-  if (!include_deleted) {
-    // If include_deleted is set to "false", set the query parameter,
-    // because its default parameter is "true".
-    url = net::AppendOrReplaceQueryParameter(url, "includeDeleted", "false");
-  }
-
-  if (start_changestamp > 0) {
-    url = net::AppendOrReplaceQueryParameter(
-        url, "startChangeId", base::Int64ToString(start_changestamp));
-  }
-
-  return AddMaxResultParam(url, max_results);
-}
-
 GURL DriveApiUrlGenerator::GetFilesUrl() const {
   return base_url_.Resolve(kDriveV2FilesUrl);
 }
 
 GURL DriveApiUrlGenerator::GetFilesGetUrl(const std::string& file_id) const {
   return base_url_.Resolve(kDriveV2FileUrlPrefix + net::EscapePath(file_id));
 }
 
 GURL DriveApiUrlGenerator::GetFilesPatchUrl(const std::string& file_id,
                                             bool set_modified_date,
@@ skipping 53 matching lines @@
 
   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)
+    url = net::AppendOrReplaceQueryParameter(url, "includeDeleted", "false");
+
+  // maxResults is "100" by default.
+  if (max_results != 100) {
+    url = net::AppendOrReplaceQueryParameter(
+        url, "maxResults", base::IntToString(max_results));
+  }
+
+  if (!page_token.empty())
+    url = net::AppendOrReplaceQueryParameter(url, "pageToken", page_token);
+
+  if (start_change_id > 0)
+    url = net::AppendOrReplaceQueryParameter(
+        url, "startChangeId", base::Int64ToString(start_change_id));
+
+  return url;
+}
+
 GURL DriveApiUrlGenerator::GetChildrenUrl(
     const std::string& resource_id) const {
   return base_url_.Resolve(
       base::StringPrintf(kDriveV2ChildrenUrlFormat,
                          net::EscapePath(resource_id).c_str()));
 }
 
 GURL DriveApiUrlGenerator::GetChildrenUrlForRemoval(
     const std::string& folder_id, const std::string& child_id) const {
   return base_url_.Resolve(
@@ skipping 14 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