google_apis: Get rid of gdata_wapi_url_util namespace

chrome/browser/google_apis/gdata_wapi_url_generator.h

Index: chrome/browser/google_apis/gdata_wapi_url_generator.h
diff --git a/chrome/browser/google_apis/gdata_wapi_url_util.h b/chrome/browser/google_apis/gdata_wapi_url_generator.h
similarity index 62%
rename from chrome/browser/google_apis/gdata_wapi_url_util.h
rename to chrome/browser/google_apis/gdata_wapi_url_generator.h
index 88189060164d07d0bbc0314666dfab069d8bb350..5f83327fa1b0802383161c0afaf9ab78abf11818 100644
--- a/chrome/browser/google_apis/gdata_wapi_url_util.h
+++ b/chrome/browser/google_apis/gdata_wapi_url_generator.h
@@ -4,43 +4,15 @@
 //
 // URL utility functions for Google Documents List API (aka WAPI).
 
-#ifndef CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_URL_UTIL_H_
-#define CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_URL_UTIL_H_
+#ifndef CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_URL_GENERATOR_H_
+#define CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_URL_GENERATOR_H_
 
 #include <string>
 
 #include "googleurl/src/gurl.h"
 
 namespace google_apis {
-namespace gdata_wapi_url_util {
 
-// The base URL for communicating with the WAPI server for production.
-extern const char kBaseUrlForProduction[];
-
-// The base URL for communicating with the local test server for testing.
-extern const char kBaseUrlForTesting[];
-
-// Adds additional parameters for API version, output content type and to show
-// folders in the feed are added to document feed URLs.
-GURL AddStandardUrlParams(const GURL& url);
-
-// Adds additional parameters to metadata feed to include installed 3rd party
-// applications.
-GURL AddMetadataUrlParams(const GURL& url);
-
-// Adds additional parameters for API version, output content type and to show
-// folders in the feed are added to document feed URLs.
-// Optionally, adds start-index=... parameter if |changestamp| is non-zero,
-// and adds q=... parameter if |search_string| is non-empty.
-GURL AddFeedUrlParams(const GURL& url,
-                      int num_items_to_fetch,
-                      int changestamp,
-                      const std::string& search_string);
-
-}  // namespace gdata_wapi_url_util
-
-// TODO(satorux): Move the class to a separate file gdata_wapi_url_generator.h.
-//
 // The class is used to generate URLs for communicating with the WAPI server.
 // for production, and the local server for testing.
 class GDataWapiUrlGenerator {
@@ -48,6 +20,29 @@ class GDataWapiUrlGenerator {
   explicit GDataWapiUrlGenerator(const GURL& base_url);
   ~GDataWapiUrlGenerator();
 
+  // The base URL for communicating with the WAPI server for production.
+  static const char kBaseUrlForProduction[];

[hashimoto, 2012/11/21 03:37:44]

How about having static methods which return GURL instead of these constants?
It seems all users of these constants are making GURL from them immediately.

[satorux1, 2012/11/21 04:05:38]

I thought about it but went with constants. Functions are a bit more complex
than constants. :)

+
+  // The base URL for communicating with the local test server for testing.
+  static const char kBaseUrlForTesting[];
+
+  // Adds additional parameters for API version, output content type and to
+  // show folders in the feed are added to document feed URLs.
+  static GURL AddStandardUrlParams(const GURL& url);
+
+  // Adds additional parameters to metadata feed to include installed 3rd
+  // party applications.
+  static GURL AddMetadataUrlParams(const GURL& url);
+
+  // Adds additional parameters for API version, output content type and to
+  // show folders in the feed are added to document feed URLs.
+  // Optionally, adds start-index=... parameter if |changestamp| is non-zero,
+  // and adds q=... parameter if |search_string| is non-empty.
+  static GURL AddFeedUrlParams(const GURL& url,
+                               int num_items_to_fetch,
+                               int changestamp,
+                               const std::string& search_string);
+
   // Generates a URL for getting the documents list feed.
   //
   // override_url:
@@ -95,4 +90,4 @@ class GDataWapiUrlGenerator {
 
 }  // namespace google_apis
 
-#endif  // CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_URL_UTIL_H_
+#endif  // CHROME_BROWSER_GOOGLE_APIS_GDATA_WAPI_URL_GENERATOR_H_