Change google_util::AppendGoogleLocaleParam to take in the application locale

chrome/browser/google/google_util.h

 // 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.
 //
 // Some Google related utility functions.
 
 #ifndef CHROME_BROWSER_GOOGLE_GOOGLE_UTIL_H__
 #define CHROME_BROWSER_GOOGLE_GOOGLE_UTIL_H__
 
 #include <string>
@@ skipping 16 matching lines @@
 GURL LinkDoctorBaseURL();
 void SetMockLinkDoctorBaseURLForTesting();
 
 // Returns the Google locale corresponding to |application_locale|.  This is
 // the same string as AppendGoogleLocaleParam adds to the URL, only without the
 // leading "hl".
 std::string GetGoogleLocale(const std::string& application_locale);
 
 // Adds the Google locale string to the URL (e.g., hl=en-US).  This does not
 // check to see if the param already exists.
-GURL AppendGoogleLocaleParam(const GURL& url);
-
-// String version of AppendGoogleLocaleParam.
-std::string StringAppendGoogleLocaleParam(const std::string& url);
+GURL AppendGoogleLocaleParam(const GURL& url,
+                             const std::string& application_locale);
 
 // Returns the Google country code string for the given Google homepage URL.
 std::string GetGoogleCountryCode(GURL google_homepage_url);
 
 // Returns the Google search URL for the given Google homepage URL.
 GURL GetGoogleSearchURL(GURL google_homepage_url);
 
 // Returns the Google base URL specified on the command line, if it exists.
 // This performs some fixup and sanity-checking to ensure that the resulting URL
 // is valid and has no query or ref.
@@ skipping 49 matching lines @@
 
 // True if |url| represents a valid Google home page URL.
 bool IsGoogleHomePageUrl(const GURL& url);
 
 // True if |url| represents a valid Google search URL.
 bool IsGoogleSearchUrl(const GURL& url);
 
 }  // namespace google_util
 
 #endif  // CHROME_BROWSER_GOOGLE_GOOGLE_UTIL_H__