google_apis: Move AppendQueryParameter() etc. from common/net/url_util.h to net/base/url_util.h

chrome/common/net/url_util_unittest.cc

Index: chrome/common/net/url_util_unittest.cc
diff --git a/chrome/common/net/url_util_unittest.cc b/chrome/common/net/url_util_unittest.cc
deleted file mode 100644
index 1d7fdda7d478ffd09399120e1f5dd1299d41b5be..0000000000000000000000000000000000000000
--- a/chrome/common/net/url_util_unittest.cc
+++ /dev/null
@@ -1,102 +0,0 @@
-// 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/common/net/url_util.h"
-
-#include "googleurl/src/gurl.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace chrome_common_net {
-
-TEST(UrlUtilTest, AppendQueryParameter) {
-  // Appending a name-value pair to a URL without a query component.
-  EXPECT_EQ("http://example.com/path?name=value",
-            AppendQueryParameter(GURL("http://example.com/path"),
-                                 "name", "value").spec());
-
-  // Appending a name-value pair to a URL with a query component.
-  // The original component should be preserved, and the new pair should be
-  // appended with '&'.
-  EXPECT_EQ("http://example.com/path?existing=one&name=value",
-            AppendQueryParameter(GURL("http://example.com/path?existing=one"),
-                                 "name", "value").spec());
-
-  // Appending a name-value pair with unsafe characters included. The
-  // unsafe characters should be escaped.
-  EXPECT_EQ("http://example.com/path?existing=one&na+me=v.alue%3D",
-            AppendQueryParameter(GURL("http://example.com/path?existing=one"),
-                                 "na me", "v.alue=").spec());
-
-}
-
-TEST(UrlUtilTest, AppendOrReplaceQueryParameter) {
-  // Appending a name-value pair to a URL without a query component.
-  EXPECT_EQ("http://example.com/path?name=value",
-            AppendOrReplaceQueryParameter(GURL("http://example.com/path"),
-                                 "name", "value").spec());
-
-  // Appending a name-value pair to a URL with a query component.
-  // The original component should be preserved, and the new pair should be
-  // appended with '&'.
-  EXPECT_EQ("http://example.com/path?existing=one&name=value",
-      AppendOrReplaceQueryParameter(
-          GURL("http://example.com/path?existing=one"),
-          "name", "value").spec());
-
-  // Appending a name-value pair with unsafe characters included. The
-  // unsafe characters should be escaped.
-  EXPECT_EQ("http://example.com/path?existing=one&na+me=v.alue%3D",
-      AppendOrReplaceQueryParameter(
-          GURL("http://example.com/path?existing=one"),
-          "na me", "v.alue=").spec());
-
-  // Replace value of an existing paramater.
-  EXPECT_EQ("http://example.com/path?existing=one&name=new",
-      AppendOrReplaceQueryParameter(
-          GURL("http://example.com/path?existing=one&name=old"),
-          "name", "new").spec());
-
-  // Replace a name-value pair with unsafe characters included. The
-  // unsafe characters should be escaped.
-  EXPECT_EQ("http://example.com/path?na+me=n.ew%3D&existing=one",
-      AppendOrReplaceQueryParameter(
-          GURL("http://example.com/path?na+me=old&existing=one"),
-          "na me", "n.ew=").spec());
-
-  // Replace the value of first parameter with this name only.
-  EXPECT_EQ("http://example.com/path?name=new&existing=one&name=old",
-      AppendOrReplaceQueryParameter(
-          GURL("http://example.com/path?name=old&existing=one&name=old"),
-          "name", "new").spec());
-
-  // Preserve the content of the original params regarless of our failure to
-  // interpret them correctly.
-  EXPECT_EQ("http://example.com/path?bar&name=new&left=&"
-            "=right&=&&name=again",
-      AppendOrReplaceQueryParameter(
-          GURL("http://example.com/path?bar&name=old&left=&"
-                "=right&=&&name=again"),
-          "name", "new").spec());
-}
-
-TEST(BrowserUrlUtilTest, GetValueForKeyInQuery) {
-  GURL url("http://example.com/path?name=value&boolParam&"
-           "url=http://test.com/q?n1%3Dv1%26n2");
-  std::string value;
-
-  // False when getting a non-existent query param.
-  EXPECT_FALSE(GetValueForKeyInQuery(url, "non-exist", &value));
-
-  // True when query param exist.
-  EXPECT_TRUE(GetValueForKeyInQuery(url, "name", &value));
-  EXPECT_EQ("value", value);
-
-  EXPECT_TRUE(GetValueForKeyInQuery(url, "boolParam", &value));
-  EXPECT_EQ("", value);
-
-  EXPECT_TRUE(GetValueForKeyInQuery(url, "url", &value));
-  EXPECT_EQ("http://test.com/q?n1=v1&n2", value);
-}
-
-}  // namespace chrome_common_net.