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

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 40 matching lines @@
 // need to restrict some behavior to only happen on Google's officially-owned
 // domains, use TransportSecurityState::IsGooglePinnedProperty() instead.
 
 // Designate whether or not a URL checking function also checks for specific
 // subdomains, or only "www" and empty subdomains.
 enum SubdomainPermission {
   ALLOW_SUBDOMAIN,
   DISALLOW_SUBDOMAIN,
 };
 
-// True if |url| is an HTTP[S] request with host "[www.]google.<TLD>" and no
-// explicit port. If |permission| is ALLOW_SUBDOMAIN, we check against host
+// Designate whether or not a URL checking function also checks for standard
+// ports (80 for http, 443 for https), or if it allows all port numbers.

[Ilya Sherman, 2012/08/31 03:05:42]

This isn't quite right -- http://www.google.com:80/ will currently fail the
IsGoogleDomainUrl check, since the code rejects any explicit ports, even if
they're the default ones.

[SteveT, 2012/08/31 13:29:31]

So the GURL code actually parses out port 80 on http URLs, and port 443 on https
URLs. That is to say, even if they're listed explicitly, they're treated as not
being there (the GURL::port() accessor returns an empty string).

So we're actually good to go with http://www.google.com:80/ (see tests... one of
the _old_ test cases tested this)

Does that seem OK? Perhaps I should change the comment in IsGoogleDomainUrl to
be more specific about this?

[Ilya Sherman, 2012/08/31 19:26:52]

Ah, ok, lovely :)
Yeah, I think we should change the comment not to talk about explicit ports
then.

[SteveT, 2012/08/31 21:58:17]

Sounds good!

+enum PortPermission {
+  ALLOW_ALL_PORTS,
+  ALLOW_STANDARD_PORTS,

[Ilya Sherman, 2012/08/31 03:05:42]

nit: Perhaps these should be ALLOW_EXPLICIT_PORTS and DISALLOW_EXPLICIT_PORTS?

[SteveT, 2012/08/31 13:29:31]

See comments above... they sort of explain why I used ALLOW_ALL_PORTS and
ALLOW_STANDARD_PORTS instead of the word EXPLICIT.

[Ilya Sherman, 2012/08/31 19:26:52]

Ok.  I still think it's useful to frame this as allowing or disallowing a
potentially dangerous permission, so perhaps ALLOW_NON_STANDARD_PORTS and
DISALLOW_NON_STANDARD_PORTS?

[SteveT, 2012/08/31 21:58:17]

Done.

+};
+
+// True if |url| is an HTTP[S] request with host "[www.]google.<TLD>". If
+// |subdomain_permission| is ALLOW_SUBDOMAIN, we check against host
+// "*.google.<TLD>" instead. If |port_permission| is ALLOW_STANDARD_PORTS, we
+// disallow explicit ports.

[SteveT, 2012/08/31 13:29:31]

I guess we could change this comment up if the word explicit is misleading, due
to how GURL handles port 80 and 443.

+bool IsGoogleDomainUrl(const std::string& url,
+                       SubdomainPermission subdomain_permission,
+                       PortPermission port_permission);
+// True if |host| is "[www.]google.<TLD>" with a valid TLD. If
+// |subdomain_permission| is ALLOW_SUBDOMAIN, we check against host
 // "*.google.<TLD>" instead.
-bool IsGoogleDomainUrl(const std::string& url, SubdomainPermission permission);
-// True if |host| is "[www.]google.<TLD>" with a valid TLD. If
-// |permission| is ALLOW_SUBDOMAIN, we check against host "*.google.<TLD>"
-// instead.
-bool IsGoogleHostname(const std::string& host, SubdomainPermission permission);
+bool IsGoogleHostname(const std::string& host,
+                      SubdomainPermission subdomain_permission);
 // True if |url| represents a valid Google home page URL.
 bool IsGoogleHomePageUrl(const std::string& url);
 // True if |url| represents a valid Google search URL.
 bool IsGoogleSearchUrl(const std::string& url);
 // True if |url| represents a valid Google search URL used by the Instant
 // Extended API.
 bool IsInstantExtendedAPIGoogleSearchUrl(const std::string& url);
 
 // True if a build is strictly organic, according to its brand code.
 bool IsOrganic(const std::string& brand);
@@ skipping 14 matching lines @@
   ~BrandForTesting();
 
  private:
   std::string brand_;
   DISALLOW_COPY_AND_ASSIGN(BrandForTesting);
 };
 
 }  // namespace google_util
 
 #endif  // CHROME_BROWSER_GOOGLE_GOOGLE_UTIL_H__