Abstract GoogleURLTracker & google_util Profile dependencies

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"
@@ skipping 77 matching lines @@
   return net::AppendQueryParameter(url, "hl", GetGoogleLocale());
 }
 
 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();
 }
 
-std::string GetGoogleCountryCode(Profile* profile) {
-  const std::string google_hostname =
-      GoogleURLTracker::GoogleURL(profile).host();
+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.
   if (country_code == "com")
     return "us";
   // Google uses the Unicode Common Locale Data Repository (CLDR), and the CLDR
   // code for the UK is "gb".
   if (country_code == "uk")
     return "gb";
   // Catalonia does not have a CLDR country code, since it's a region in Spain,
   // so use Spain instead.
   if (country_code == "cat")
     return "es";
   return country_code;
 }
 
-GURL GetGoogleSearchURL(Profile* profile) {
-  // The url returned by the tracker does not include the "/search" or the
-  // "q=" query string.
+GURL GetGoogleSearchURL(GURL google_homepage_url) {
+  // To transform the homepage URL into the corresponding search URL, add the
+  // "search" and the "q=" query string.
   std::string search_path = "search";
   std::string query_string = "q=";
   GURL::Replacements replacements;
   replacements.SetPathStr(search_path);
   replacements.SetQueryStr(query_string);
-  return GoogleURLTracker::GoogleURL(profile).ReplaceComponents(replacements);
+  return google_homepage_url.ReplaceComponents(replacements);
 }
 
 #if defined(OS_WIN)
 
 bool GetBrand(std::string* brand) {
   if (brand_for_testing) {
     brand->assign(brand_for_testing);
     return true;
   }
 
@@ skipping 175 matching lines @@
   DCHECK(brand_for_testing == NULL);
   brand_for_testing = brand_.c_str();
 }
 
 BrandForTesting::~BrandForTesting() {
   brand_for_testing = NULL;
 }
 
 
 }  // namespace google_util