google_apis: Get rid of gdata_wapi_url_util namespace

chrome/browser/google_apis/gdata_wapi_url_generator_unittest.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 "chrome/browser/google_apis/gdata_wapi_url_generator.h"
 
 #include "googleurl/src/gurl.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace google_apis {
-namespace gdata_wapi_url_util {
 
-TEST(GDataWapiUrlUtilTest, AddStandardUrlParams) {
-  EXPECT_EQ("http://www.example.com/?v=3&alt=json",
-            AddStandardUrlParams(GURL("http://www.example.com")).spec());
-}
-
-TEST(GDataWapiUrlUtilTest, AddMetadataUrlParams) {
-  EXPECT_EQ("http://www.example.com/?v=3&alt=json&include-installed-apps=true",
-            AddMetadataUrlParams(GURL("http://www.example.com")).spec());
-}
-
-TEST(GDataWapiUrlUtilTest, AddFeedUrlParams) {
-  EXPECT_EQ("http://www.example.com/?v=3&alt=json&showfolders=true"
-            "&max-results=100"
-            "&include-installed-apps=true",
-            AddFeedUrlParams(GURL("http://www.example.com"),
-                             100,  // num_items_to_fetch
-                             0,  // changestamp
-                             ""  // search_string
-                             ).spec());
-  EXPECT_EQ("http://www.example.com/?v=3&alt=json&showfolders=true"
-            "&max-results=100"
-            "&include-installed-apps=true"
-            "&start-index=123",
-            AddFeedUrlParams(GURL("http://www.example.com"),
-                             100,  // num_items_to_fetch
-                             123,  // changestamp
-                             ""  // search_string
-                             ).spec());
-  EXPECT_EQ("http://www.example.com/?v=3&alt=json&showfolders=true"
-            "&max-results=100"
-            "&include-installed-apps=true"
-            "&start-index=123"
-            "&q=%22foo+bar%22",
-            AddFeedUrlParams(GURL("http://www.example.com"),
-                             100,  // num_items_to_fetch
-                             123,  // changestamp
-                             "\"foo bar\""  // search_string
-                             ).spec());
-}
-
-}  // namespace gdata_wapi_url_util
-
-// TODO(satorux): Move the following test code to a separate file
-// gdata_wapi_url_generator_unittest.cc.
 class GDataWapiUrlGeneratorTest : public testing::Test {
  public:
   GDataWapiUrlGeneratorTest()
-      : url_generator_(GURL(gdata_wapi_url_util::kBaseUrlForProduction)) {
+      : url_generator_(GURL(GDataWapiUrlGenerator::kBaseUrlForProduction)) {
   }
 
  protected:
   GDataWapiUrlGenerator url_generator_;
 };
 
+TEST_F(GDataWapiUrlGeneratorTest, AddStandardUrlParams) {
+  EXPECT_EQ("http://www.example.com/?v=3&alt=json",
+            GDataWapiUrlGenerator::AddStandardUrlParams(
+                GURL("http://www.example.com")).spec());
+}
+
+TEST_F(GDataWapiUrlGeneratorTest, AddMetadataUrlParams) {
+  EXPECT_EQ("http://www.example.com/?v=3&alt=json&include-installed-apps=true",
+            GDataWapiUrlGenerator::AddMetadataUrlParams(
+                GURL("http://www.example.com")).spec());
+}
+
+TEST_F(GDataWapiUrlGeneratorTest, AddFeedUrlParams) {
+  EXPECT_EQ("http://www.example.com/?v=3&alt=json&showfolders=true"
+            "&max-results=100"
+            "&include-installed-apps=true",
+            GDataWapiUrlGenerator::AddFeedUrlParams(
+                GURL("http://www.example.com"),
+                100,  // num_items_to_fetch
+                0,  // changestamp
+                ""  // search_string
+                                                 ).spec());
+  EXPECT_EQ("http://www.example.com/?v=3&alt=json&showfolders=true"
+            "&max-results=100"
+            "&include-installed-apps=true"
+            "&start-index=123",
+            GDataWapiUrlGenerator::AddFeedUrlParams(
+                GURL("http://www.example.com"),
+                100,  // num_items_to_fetch
+                123,  // changestamp
+                ""  // search_string
+                                                 ).spec());
+  EXPECT_EQ("http://www.example.com/?v=3&alt=json&showfolders=true"
+            "&max-results=100"
+            "&include-installed-apps=true"
+            "&start-index=123"
+            "&q=%22foo+bar%22",
+            GDataWapiUrlGenerator::AddFeedUrlParams(
+                GURL("http://www.example.com"),
+                100,  // num_items_to_fetch
+                123,  // changestamp
+                "\"foo bar\""  // search_string
+                                                 ).spec());
+}
+
 TEST_F(GDataWapiUrlGeneratorTest, GenerateDocumentListUrl) {
   // This is the very basic URL for the GetDocuments operation.
   EXPECT_EQ(
       "https://docs.google.com/feeds/default/private/full/-/mine"
       "?v=3&alt=json&showfolders=true&max-results=500"
       "&include-installed-apps=true",
       url_generator_.GenerateDocumentListUrl(GURL(),  // override_url,
                                              0,  // start_changestamp,
                                              "",  // search_string,
                                              false, // shared_with_me,
@@ skipping 81 matching lines @@
 }
 
 TEST_F(GDataWapiUrlGeneratorTest, GenerateAccountMetadataUrl) {
   EXPECT_EQ(
       "https://docs.google.com/feeds/metadata/default"
       "?v=3&alt=json&include-installed-apps=true",
       url_generator_.GenerateAccountMetadataUrl().spec());
 }
 
 }  // namespace google_apis