Revert 134625 - Transmit a X-Chrome-UMA-Enabled bit to Google domains from clients that have UMA en…

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 26 matching lines @@
   base::SplitString(str, '&', &parameters);
   for (std::vector<std::string>::const_iterator itr = parameters.begin();
        itr != parameters.end();
        ++itr) {
     if (StartsWithASCII(*itr, "q=", false) && itr->size() > 2)
       return true;
   }
   return false;
 }
 
+// True if |url| is an HTTP[S] request with host "[www.]google.<TLD>" and no
+// explicit port.
+bool IsGoogleDomainUrl(const GURL& url) {
+  return url.is_valid() && (url.SchemeIs("http") || url.SchemeIs("https")) &&
+      url.port().empty() && google_util::IsGoogleHostname(url.host());
+}
+
 }  // anonymous namespace
 
 namespace google_util {
 
 const char kLinkDoctorBaseURL[] =
     "http://linkhelp.clients.google.com/tbproxy/lh/fixurl";
 
 BrandForTesting::BrandForTesting(const std::string& brand) : brand_(brand) {
   DCHECK(brand_for_testing == NULL);
   brand_for_testing = brand_.c_str();
@@ skipping 71 matching lines @@
   return true;
 }
 
 bool GetReactivationBrand(std::string* brand) {
   brand->clear();
   return true;
 }
 
 #endif
 
-bool IsGoogleDomainUrl(const std::string& url, SubdomainPermission permission) {
-  GURL original_url(url);
-  return original_url.is_valid() && original_url.port().empty() &&
-      (original_url.SchemeIs("http") || original_url.SchemeIs("https")) &&
-      google_util::IsGoogleHostname(original_url.host(), permission);
-}
-
-bool IsGoogleHostname(const std::string& host,
-                      SubdomainPermission permission) {
+bool IsGoogleHostname(const std::string& host) {
   size_t tld_length =
       net::RegistryControlledDomainService::GetRegistryLength(host, false);
   if ((tld_length == 0) || (tld_length == std::string::npos))
     return false;
   std::string host_minus_tld(host, 0, host.length() - tld_length);
-  if (LowerCaseEqualsASCII(host_minus_tld, "google."))
-    return true;
-  if (permission == ALLOW_SUBDOMAIN)
-    return EndsWith(host_minus_tld, ".google.", false);
-  return LowerCaseEqualsASCII(host_minus_tld, "www.google.");
+  return LowerCaseEqualsASCII(host_minus_tld, "www.google.") ||
+      LowerCaseEqualsASCII(host_minus_tld, "google.");
 }
 
 bool IsGoogleHomePageUrl(const std::string& url) {
   GURL original_url(url);
 
   // First check to see if this has a Google domain.
-  if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN))
+  if (!IsGoogleDomainUrl(original_url))
     return false;
 
   // Make sure the path is a known home page path.
   std::string path(original_url.path());
   if (path != "/" && path != "/webhp" &&
       !StartsWithASCII(path, "/ig", false)) {
     return false;
   }
 
   return true;
 }
 
 bool IsGoogleSearchUrl(const std::string& url) {
   GURL original_url(url);
 
   // First check to see if this has a Google domain.
-  if (!IsGoogleDomainUrl(url, DISALLOW_SUBDOMAIN))
+  if (!IsGoogleDomainUrl(original_url))
     return false;
 
   // Make sure the path is a known search path.
   std::string path(original_url.path());
   bool has_valid_path = false;
   bool is_home_page_base = false;
   if (path == "/search") {
     has_valid_path = true;
   } else if (path == "/webhp" || path == "/") {
     // Note that we allow both "/" and "" paths, but GURL spits them
@@ skipping 67 matching lines @@
   const char* const kBrands[] = {
     "CHIQ", "CHSG", "HLJY", "NTMO", "OOBA", "OOBB", "OOBC", "OOBD", "OOBE",
     "OOBF", "OOBG", "OOBH", "OOBI", "OOBJ", "IDCM",
   };
   const char* const* end = &kBrands[arraysize(kBrands)];
   const char* const* found = std::find(&kBrands[0], end, brand);
   return found != end;
 }
 
 }  // namespace google_util