Add more flexible handling of what is considered a google home page.

chrome/browser/google/google_util.cc

 // Copyright (c) 2011 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 "base/command_line.h"
 #include "base/string16.h"
@@ skipping 64 matching lines @@
       net::RegistryControlledDomainService::GetDomainAndRegistry(
           GoogleURLTracker::GoogleURL()));
   const size_t first_dot = google_domain.find('.');
   if (first_dot == std::string::npos) {
     NOTREACHED();
     return url;
   }
   return AppendParam(url, "sd", google_domain.substr(first_dot + 1));
 }
 
+bool IsGoogleHomePageUrl(const std::string& url) {

[SteveT, 2011/11/28 21:04:49]

Nit: Move down to roughly match header order.

[Roger Tawa OOO till Jul 10th, 2011/11/29 16:00:09]

Done.

+  GURL original_url(url);
+  if (!original_url.is_valid())
+    return false;
+
+  // Make sure the scheme is valid.
+  if (!original_url.SchemeIs("http") && !original_url.SchemeIs("https"))
+    return false;
+
+  // Make sure port is default for the respective scheme.
+  if (!original_url.port().empty())

[SteveT, 2011/11/28 21:04:49]

Do we want to allow :80 and :443 for http and https, respectively, or do we want
the port to be explicitly empty?

[Roger Tawa OOO till Jul 10th, 2011/11/29 16:00:09]

GURL does not make it easy to detect default port numbers for a given scheme, so
as long as the port number are the expected ones, I don't think it matters. 
However, I'm getting the PSO folks to double check the good and bad URL
mentioned in the test, so I'll ask them this too.

+    return false;
+
+  // Accept only valid TLD.
+  size_t tld_length = net::RegistryControlledDomainService::GetRegistryLength(
+      original_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 = original_url.host();
+  host = host.substr(0, host.length() - tld_length);
+  if (!LowerCaseEqualsASCII(host, "www.google."))
+    return false;
+
+  // Make sure the path is a known home page path.
+  std::string path(original_url.path());
+  if (!LowerCaseEqualsASCII(path, "/") &&
+      !LowerCaseEqualsASCII(path, "/webhp") &&
+      !StartsWithASCII(path, "/ig", false)) {
+    return false;
+  }
+
+  return true;
+}
+
 #if defined(OS_WIN)
 
 bool GetBrand(std::string* brand) {
   if (brand_for_testing) {
     brand->assign(brand_for_testing);
     return true;
   }
 
   string16 brand16;
   bool ret = GoogleUpdateSettings::GetBrand(&brand16);
@@ skipping 85 matching lines @@
   const char* const kBrands[] = {
     "CHIQ", "CHSG", "HLJY", "NTMO", "OOBA", "OOBB", "OOBC", "OOBD", "OOBE",
     "OOBF", "OOBG", "OOBH", "OOBI", "OOBJ",
   };
   const char* const* end = &kBrands[arraysize(kBrands)];
   const char* const* found = std::find(&kBrands[0], end, brand);
   return found != end;
 }
 
 }  // namespace google_util