Merge 262846 "Revert 255617, due to it not tracking use of the link doctor page."

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 11 matching lines @@
 // |str| should be a query or a hash fragment, without the ? or # (as
 // returned by GURL::query() or GURL::ref().
 bool HasGoogleSearchQueryParam(const std::string& str);
 
 // The query key that identifies a Google Extended API request for Instant.
 const char kInstantExtendedAPIParam[] = "espv";
 
 GURL LinkDoctorBaseURL();
 void SetMockLinkDoctorBaseURLForTesting();
 
-// Returns the Google locale.  This is the same string as
-// AppendGoogleLocaleParam adds to the URL, only without the leading "hl".
-std::string GetGoogleLocale();
-
 // 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);
 
-// Returns the Google country code string for the given profile.
-std::string GetGoogleCountryCode(Profile* profile);
-
-// Returns the Google search URL for the given profile.
-GURL GetGoogleSearchURL(Profile* profile);
+// Adds the Google TLD string for the given profile to the URL (e.g., sd=com).
+// This does not check to see if the param already exists.
+GURL AppendGoogleTLDParam(Profile* profile, const GURL& url);
 
 // Returns in |brand| the brand code or distribution tag that has been
 // assigned to a partner. Returns false if the information is not available.
 bool GetBrand(std::string* brand);
 
 // Returns in |brand| the reactivation brand code or distribution tag
 // that has been assigned to a partner for reactivating a dormant chrome
 // install. Returns false if the information is not available.
 bool GetReactivationBrand(std::string* brand);
 
@@ skipping 75 matching lines @@
   ~BrandForTesting();
 
  private:
   std::string brand_;
   DISALLOW_COPY_AND_ASSIGN(BrandForTesting);
 };
 
 }  // namespace google_util
 
 #endif  // CHROME_BROWSER_GOOGLE_GOOGLE_UTIL_H__