Change google_util::AppendGoogleLocaleParam to take in the application locale

chrome/browser/google/google_util.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/google_util.h"
 
 #include <string>
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/strings/string16.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/browser_process.h"
 #include "components/google/core/browser/google_switches.h"
 #include "components/google/core/browser/google_url_tracker.h"
 #include "components/url_fixer/url_fixer.h"
 #include "net/base/registry_controlled_domains/registry_controlled_domain.h"
 #include "net/base/url_util.h"
 #include "url/gurl.h"
 
 // Only use Link Doctor on official builds.  It uses an API key, too, but
 // seems best to just disable it, for more responsive error pages and to reduce
 // server load.
@@ skipping 38 matching lines @@
 
 void SetMockLinkDoctorBaseURLForTesting() {
   gUseMockLinkDoctorBaseURLForTesting = true;
 }
 
 std::string GetGoogleLocale(const std::string& application_locale) {
   // Google does not recognize "nb" for Norwegian Bokmal; it uses "no".
   return (application_locale == "nb") ? "no" : application_locale;
 }
 
-GURL AppendGoogleLocaleParam(const GURL& url) {
+GURL AppendGoogleLocaleParam(const GURL& url,
+                             const std::string& application_locale) {
   return net::AppendQueryParameter(
-      url, "hl", GetGoogleLocale(g_browser_process->GetApplicationLocale()));
-}
-
-std::string StringAppendGoogleLocaleParam(const std::string& url) {
-  GURL original_url(url);
-  DCHECK(original_url.is_valid());
-  GURL localized_url = AppendGoogleLocaleParam(original_url);
-  return localized_url.spec();
+      url, "hl", GetGoogleLocale(application_locale));
 }
 
 std::string GetGoogleCountryCode(GURL google_homepage_url) {
   const std::string google_hostname = google_homepage_url.host();
   const size_t last_dot = google_hostname.find_last_of('.');
   if (last_dot == std::string::npos) {
     NOTREACHED();
   }
   std::string country_code = google_hostname.substr(last_dot + 1);
   // Assume the com TLD implies the US.
@@ skipping 94 matching lines @@
   if (!is_home_page_base && (path != "/search"))
     return false;
 
   // Check for query parameter in URL parameter and hash fragment, depending on
   // the path type.
   return HasGoogleSearchQueryParam(url.ref()) ||
       (!is_home_page_base && HasGoogleSearchQueryParam(url.query()));
 }
 
 }  // namespace google_util