Add DriveApiUrlGenerator.

chrome/browser/google_apis/drive_api_operations.cc

Index: chrome/browser/google_apis/drive_api_operations.cc
diff --git a/chrome/browser/google_apis/drive_api_operations.cc b/chrome/browser/google_apis/drive_api_operations.cc
index 96289f3b7827d0e65f8e2d3153ed288fd6a3124d..d7f28fc8aebae3d061d0b23c0eedc99fd316fed4 100644
--- a/chrome/browser/google_apis/drive_api_operations.cc
+++ b/chrome/browser/google_apis/drive_api_operations.cc
@@ -4,39 +4,24 @@
 
 #include "chrome/browser/google_apis/drive_api_operations.h"
 
-#include "base/string_number_conversions.h"
-#include "base/stringprintf.h"
-#include "chrome/common/net/url_util.h"
-
 namespace google_apis {
 
-namespace {
-
-const char kDriveV2AboutURL[] = "https://www.googleapis.com/drive/v2/about";
-const char kDriveV2ApplistURL[] = "https://www.googleapis.com/drive/v2/apps";
-const char kDriveV2ChangelistURL[] =
-    "https://www.googleapis.com/drive/v2/changes";
-
-const char kDriveV2FilelistURL[] = "https://www.googleapis.com/drive/v2/files";
-const char kDriveV2FileURLFormat[] =
-    "https://www.googleapis.com/drive/v2/files/%s";
-
-}  // namespace
-
 //============================== GetAboutOperation =============================
 
 GetAboutOperation::GetAboutOperation(
     OperationRegistry* registry,
     net::URLRequestContextGetter* url_request_context_getter,
+    const DriveApiUrlGenerator& url_generator,
     const GetDataCallback& callback)
-    : GetDataOperation(registry, url_request_context_getter, callback) {
+    : GetDataOperation(registry, url_request_context_getter, callback),
+      url_generator_(url_generator) {
   DCHECK(!callback.is_null());
 }
 
 GetAboutOperation::~GetAboutOperation() {}
 
 GURL GetAboutOperation::GetURL() const {
-  return GURL(kDriveV2AboutURL);
+  return url_generator_.GetAboutUrl();
 }
 
 //============================== GetApplistOperation ===========================
@@ -44,15 +29,17 @@ GURL GetAboutOperation::GetURL() const {
 GetApplistOperation::GetApplistOperation(
     OperationRegistry* registry,
     net::URLRequestContextGetter* url_request_context_getter,
+    const DriveApiUrlGenerator& url_generator,
     const GetDataCallback& callback)
-    : GetDataOperation(registry, url_request_context_getter, callback) {
+    : GetDataOperation(registry, url_request_context_getter, callback),
+      url_generator_(url_generator) {
   DCHECK(!callback.is_null());
 }
 
 GetApplistOperation::~GetApplistOperation() {}
 
 GURL GetApplistOperation::GetURL() const {
-  return GURL(kDriveV2ApplistURL);
+  return url_generator_.GetApplistUrl();
 }
 
 //============================ GetChangelistOperation ==========================
@@ -60,24 +47,21 @@ GURL GetApplistOperation::GetURL() const {
 GetChangelistOperation::GetChangelistOperation(
     OperationRegistry* registry,
     net::URLRequestContextGetter* url_request_context_getter,
+    const DriveApiUrlGenerator& url_generator,
     const GURL& url,
     int64 start_changestamp,
     const GetDataCallback& callback)
     : GetDataOperation(registry, url_request_context_getter, callback),
-      url_(kDriveV2ChangelistURL),
+      url_generator_(url_generator),
+      url_(url),
       start_changestamp_(start_changestamp) {
   DCHECK(!callback.is_null());
-  if (!url.is_empty())
-    url_ = url;
 }
 
 GetChangelistOperation::~GetChangelistOperation() {}
 
 GURL GetChangelistOperation::GetURL() const {
-  if (start_changestamp_)
-    return chrome_common_net::AppendOrReplaceQueryParameter(
-        url_, "startChangeId", base::Int64ToString(start_changestamp_));
-  return url_;
+  return url_generator_.GetChangelistUrl(url_, start_changestamp_);
 }
 
 //============================= GetFlielistOperation ===========================
@@ -85,25 +69,21 @@ GURL GetChangelistOperation::GetURL() const {
 GetFilelistOperation::GetFilelistOperation(
     OperationRegistry* registry,
     net::URLRequestContextGetter* url_request_context_getter,
+    const DriveApiUrlGenerator& url_generator,
     const GURL& url,
     const std::string& search_string,
     const GetDataCallback& callback)
     : GetDataOperation(registry, url_request_context_getter, callback),
-      url_(kDriveV2FilelistURL),
+      url_generator_(url_generator),
+      url_(url),
       search_string_(search_string) {
   DCHECK(!callback.is_null());
-  if (!url.is_empty())
-    url_ = url;
 }
 
 GetFilelistOperation::~GetFilelistOperation() {}
 
 GURL GetFilelistOperation::GetURL() const {
-  if (!search_string_.empty()) {
-    return chrome_common_net::AppendOrReplaceQueryParameter(
-        url_, "q", search_string_);
-  }
-  return url_;
+  return url_generator_.GetFilelistUrl(url_, search_string_);
 }
 
 //=============================== GetFlieOperation =============================
@@ -111,9 +91,11 @@ GURL GetFilelistOperation::GetURL() const {
 GetFileOperation::GetFileOperation(
     OperationRegistry* registry,
     net::URLRequestContextGetter* url_request_context_getter,
+    const DriveApiUrlGenerator& url_generator,
     const std::string& file_id,
     const GetDataCallback& callback)
     : GetDataOperation(registry, url_request_context_getter, callback),
+      url_generator_(url_generator),
       file_id_(file_id) {
   DCHECK(!callback.is_null());
 }
@@ -121,7 +103,7 @@ GetFileOperation::GetFileOperation(
 GetFileOperation::~GetFileOperation() {}
 
 GURL GetFileOperation::GetURL() const {
-  return GURL(base::StringPrintf(kDriveV2FileURLFormat, file_id_.c_str()));
+  return url_generator_.GetFileUrl(file_id_);
 }
 
 }  // namespace google_apis