Move AppendParam() to browser_url_util.h to make it reusable.

Along the way, give it a bit more descriptive name: AppendQueryParameter(),
and add some code to escape the parameter name and the value.

BUG=none
TEST=added a unit test.


Review URL: http://codereview.chromium.org/9015006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@116019 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 4 insertions, 15 deletions

diff --git a/chrome/browser/google/google_util.cc b/chrome/browser/google/google_util.cc
index 77a1fc7..3c69b22 100644
--- a/chrome/browser/google/google_util.cc
+++ b/chrome/browser/google/google_util.cc
@@ -12,6 +12,7 @@
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/google/google_url_tracker.h"
+#include "chrome/browser/net/browser_url_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "googleurl/src/gurl.h"
@@ -25,19 +26,6 @@ namespace {
 
 const char* brand_for_testing = NULL;
 
-// A helper method for adding a query param to |url|.
-GURL AppendParam(const GURL& url,
-                 const std::string& param_name,
-                 const std::string& param_value) {
-  std::string query(url.query());
-  if (!query.empty())
-    query += "&";
-  query += param_name + "=" + param_value;
-  GURL::Replacements repl;
-  repl.SetQueryStr(query);
-  return url.ReplaceComponents(repl);
-}
-
 }  // anonymous namespace
 
 namespace google_util {
@@ -60,7 +48,7 @@ GURL AppendGoogleLocaleParam(const GURL& url) {
   std::string locale = g_browser_process->GetApplicationLocale();
   if (locale == "nb")
     locale = "no";
-  return AppendParam(url, "hl", locale);
+  return chrome_browser_net::AppendQueryParameter(url, "hl", locale);
 }
 
 std::string StringAppendGoogleLocaleParam(const std::string& url) {
@@ -79,7 +67,8 @@ GURL AppendGoogleTLDParam(const GURL& url) {
     NOTREACHED();
     return url;
   }
-  return AppendParam(url, "sd", google_domain.substr(first_dot + 1));
+  return chrome_browser_net::AppendQueryParameter(
+      url, "sd", google_domain.substr(first_dot + 1));
 }
 
 #if defined(OS_WIN)