Clean up TemplateURL prepopulate data:

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>".
+// True if |url| is an HTTP[S] request with host "[www.]google.<TLD>" and no
+// explicit port.
 bool IsGoogleDomainUrl(const GURL& url) {
-  if (!url.is_valid())
-    return false;
-
-  // Make sure the scheme is valid.
-  if (!url.SchemeIs("http") && !url.SchemeIs("https"))
-    return false;
-
-  // Make sure port is default for the respective scheme.
-  if (!url.port().empty())
-    return false;
-
-  // Accept only valid TLD.
-  size_t tld_length = net::RegistryControlledDomainService::GetRegistryLength(
-      url, false);
-  if (tld_length == 0 || tld_length == std::string::npos)
-    return false;
-
-  // We only accept "[www.]google." in front of the TLD.
-  std::string host = url.host();
-  host = host.substr(0, host.length() - tld_length);
-  if (!LowerCaseEqualsASCII(host, "www.google.") &&
-      !LowerCaseEqualsASCII(host, "google."))
-    return false;
-
-  return true;
+  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) {
@@ skipping 73 matching lines @@
   return true;
 }
 
 bool GetReactivationBrand(std::string* brand) {
   brand->clear();
   return true;
 }
 
 #endif
 
+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);
+  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(original_url))
     return false;
 
   // Make sure the path is a known home page path.
   std::string path(original_url.path());
   if (path != "/" && path != "/webhp" &&
@@ skipping 89 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