google_apis: Rename and simplify GenerateGetDocumentsURL()

chrome/browser/google_apis/gdata_wapi_url_util.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/gdata_wapi_url_util.h"
 
+#include "base/logging.h"
 #include "base/stringprintf.h"
 #include "chrome/common/net/url_util.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/escape.h"
 
 namespace google_apis {
 namespace gdata_wapi_url_util {
 
 namespace {
 
@@ skipping 19 matching lines @@
 #endif
 
 // URL requesting documents list that shared to the authenticated user only
 const char kGetDocumentListURLForSharedWithMe[] =
     "https://docs.google.com/feeds/default/private/full/-/shared-with-me";
 
 // URL requesting documents list of changes to documents collections.
 const char kGetChangesListURL[] =
     "https://docs.google.com/feeds/default/private/changes";
 
-// Generates a URL for getting document list. If |directory_resource_id| is
-// empty, returns a URL for fetching all documents. If it's given, returns a
-// URL for fetching documents in a particular directory.
-// This function is used to implement GenerateGetDocumentsURL().
-GURL GenerateDocumentListURL(const std::string& directory_resource_id) {
-  if (directory_resource_id.empty())
-    return GURL(kGetDocumentListURLForAllDocuments);
-
-  return GURL(base::StringPrintf(kGetDocumentListURLForDirectoryFormat,
-                                 net::EscapePath(
-                                     directory_resource_id).c_str()));
-}
-
 }  // namespace
 
 GURL AddStandardUrlParams(const GURL& url) {
   GURL result =
       chrome_common_net::AppendOrReplaceQueryParameter(url, "v", "3");
   result =
       chrome_common_net::AppendOrReplaceQueryParameter(result, "alt", "json");
   return result;
 }
 
@@ skipping 27 matching lines @@
         base::StringPrintf("%d", changestamp));
   }
 
   if (!search_string.empty()) {
     result = chrome_common_net::AppendOrReplaceQueryParameter(
         result, "q", search_string);
   }
   return result;
 }
 
-GURL GenerateGetDocumentsURL(
+GURL GenerateDocumentListUrl(
     const GURL& override_url,
     int start_changestamp,
     const std::string& search_string,
     bool shared_with_me,
     const std::string& directory_resource_id) {
   int max_docs = search_string.empty() ? kMaxDocumentsPerFeed :
                                          kMaxDocumentsPerSearchFeed;
-
-  if (!override_url.is_empty())
-    return gdata_wapi_url_util::AddFeedUrlParams(override_url,
-                                                 max_docs,
-                                                 0,
-                                                 search_string);
-
-  if (shared_with_me) {
-    return gdata_wapi_url_util::AddFeedUrlParams(
-        GURL(kGetDocumentListURLForSharedWithMe),
-        max_docs,
-        0,
-        search_string);
+  GURL url;
+  if (!override_url.is_empty()) {
+    url = override_url;
+  } else if (shared_with_me) {
+    url = GURL(kGetDocumentListURLForSharedWithMe);
+  } else if (start_changestamp == 0) {
+    if (directory_resource_id.empty()) {

[hashimoto, 2012/11/20 06:07:35]

How about putting start_changestamp > 0 case before start_changestamp == 0 case?
This way, we can reduce the indent level of if (directory_resource_id.empty()).

[satorux1, 2012/11/20 06:13:28]

good idea. done.

+      url = GURL(kGetDocumentListURLForAllDocuments);
+    } else {
+      url = GURL(base::StringPrintf(kGetDocumentListURLForDirectoryFormat,
+                                    net::EscapePath(
+                                        directory_resource_id).c_str()));
+    }
+  } else {
+    DCHECK_LT(0, start_changestamp);
+    // The start changestamp shouldn't be used for a search.
+    DCHECK(search_string.empty());
+    url = GURL(kGetChangesListURL);
   }
-
-  if (start_changestamp == 0) {
-    return gdata_wapi_url_util::AddFeedUrlParams(
-        gdata_wapi_url_util::GenerateDocumentListURL(directory_resource_id),
-        max_docs,
-        0,
-        search_string);
-  }
-
-  return gdata_wapi_url_util::AddFeedUrlParams(
-      GURL(kGetChangesListURL),
-      kMaxDocumentsPerFeed,
-      start_changestamp,
-      std::string());
+  return AddFeedUrlParams(url, max_docs, start_changestamp, search_string);
 }
 
 }  // namespace gdata_wapi_url_util
 }  // namespace google_apis