Allow the X-Chrome-Variations header to transmit to all ports.

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 180 matching lines @@
   // instance, in a regular Google search they'll be in the query but in a
   // Google Instant search they can be in both. The ref is the correct one to
   // return in this case, so test the ref component first.
   if (ExtractSearchTermsFromComponent(url, &parsed_url.ref, &search_terms) ||
       ExtractSearchTermsFromComponent(url, &parsed_url.query, &search_terms)) {
     return search_terms;
   }
   return string16();
 }
 
-bool IsGoogleDomainUrl(const std::string& url, SubdomainPermission permission) {
+bool IsGoogleDomainUrl(const std::string& url,
+                       SubdomainPermission subdomain_permission,
+                       PortPermission port_permission) {
   GURL original_url(url);
   if (!original_url.is_valid() ||
       !(original_url.SchemeIs("http") || original_url.SchemeIs("https")))
     return false;
 
   // If we have the Instant URL overridden with a command line flag, accept
   // its domain/port combination as well.
   const CommandLine& command_line = *CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kInstantURL)) {
     GURL custom_instant_url(
         command_line.GetSwitchValueASCII(switches::kInstantURL));
     if (original_url.host() == custom_instant_url.host() &&
         original_url.port() == custom_instant_url.port())
       return true;
   }
 
-  return original_url.port().empty() &&
-      google_util::IsGoogleHostname(original_url.host(), permission);
+  return (original_url.port().empty() ||
+      port_permission == ALLOW_NON_STANDARD_PORTS) &&
+      google_util::IsGoogleHostname(original_url.host(), subdomain_permission);
 }
 
 bool IsGoogleHostname(const std::string& host,
-                      SubdomainPermission permission) {
+                      SubdomainPermission subdomain_permission) {
   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)
+  if (subdomain_permission == ALLOW_SUBDOMAIN)
     return EndsWith(host_minus_tld, ".google.", false);
   return LowerCaseEqualsASCII(host_minus_tld, "www.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(url, DISALLOW_SUBDOMAIN, DISALLOW_NON_STANDARD_PORTS))
     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(url, DISALLOW_SUBDOMAIN, DISALLOW_NON_STANDARD_PORTS))
     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 90 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