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

chrome/browser/google/google_util_unittest.cc

Index: chrome/browser/google/google_util_unittest.cc
diff --git a/chrome/browser/google/google_util_unittest.cc b/chrome/browser/google/google_util_unittest.cc
index d0d52803fb3241f6fa9792578e9e2b0d469d1c08..05625912e751bfaa834a57f53ab72b9a38b278e6 100644
--- a/chrome/browser/google/google_util_unittest.cc
+++ b/chrome/browser/google/google_util_unittest.cc
@@ -277,49 +277,74 @@ TEST(GoogleUtilTest, IsInstantExtendedAPIGoogleSearchUrl) {
 TEST(GoogleUtilTest, GoogleDomains) {
   // Test some good Google domains (valid TLDs).
   EXPECT_TRUE(IsGoogleDomainUrl("http://www.google.com",
-                                google_util::ALLOW_SUBDOMAIN));
+                                google_util::ALLOW_SUBDOMAIN,
+                                google_util::ALLOW_STANDARD_PORTS));
   EXPECT_TRUE(IsGoogleDomainUrl("http://google.com",
-                                google_util::ALLOW_SUBDOMAIN));
+                                google_util::ALLOW_SUBDOMAIN,
+                                google_util::ALLOW_STANDARD_PORTS));
   EXPECT_TRUE(IsGoogleDomainUrl("http://www.google.ca",
-                                google_util::ALLOW_SUBDOMAIN));
+                                google_util::ALLOW_SUBDOMAIN,
+                                google_util::ALLOW_STANDARD_PORTS));
   EXPECT_TRUE(IsGoogleDomainUrl("http://www.google.biz.tj",
-                                google_util::ALLOW_SUBDOMAIN));
+                                google_util::ALLOW_SUBDOMAIN,
+                                google_util::ALLOW_STANDARD_PORTS));
   EXPECT_TRUE(IsGoogleDomainUrl("http://www.google.com/search?q=something",
-                                google_util::ALLOW_SUBDOMAIN));
+                                google_util::ALLOW_SUBDOMAIN,
+                                google_util::ALLOW_STANDARD_PORTS));
   EXPECT_TRUE(IsGoogleDomainUrl("http://www.google.com/webhp",
-                                google_util::ALLOW_SUBDOMAIN));
+                                google_util::ALLOW_SUBDOMAIN,
+                                google_util::ALLOW_STANDARD_PORTS));
 
   // Test some bad Google domains (invalid TLDs).
   EXPECT_FALSE(IsGoogleDomainUrl("http://www.google.notrealtld",
-                                 google_util::ALLOW_SUBDOMAIN));
+                                 google_util::ALLOW_SUBDOMAIN,
+                                 google_util::ALLOW_STANDARD_PORTS));
   EXPECT_FALSE(IsGoogleDomainUrl("http://www.google.faketld/search?q=something",
-                                 google_util::ALLOW_SUBDOMAIN));
+                                 google_util::ALLOW_SUBDOMAIN,
+                                 google_util::ALLOW_STANDARD_PORTS));
   EXPECT_FALSE(IsGoogleDomainUrl("http://www.yahoo.com",
-                                 google_util::ALLOW_SUBDOMAIN));
+                                 google_util::ALLOW_SUBDOMAIN,
+                                 google_util::ALLOW_STANDARD_PORTS));
 
   // Test subdomain checks.
   EXPECT_TRUE(IsGoogleDomainUrl("http://images.google.com",
-                                google_util::ALLOW_SUBDOMAIN));
+                                google_util::ALLOW_SUBDOMAIN,
+                                google_util::ALLOW_STANDARD_PORTS));
   EXPECT_FALSE(IsGoogleDomainUrl("http://images.google.com",
-                                 google_util::DISALLOW_SUBDOMAIN));
+                                 google_util::DISALLOW_SUBDOMAIN,
+                                 google_util::ALLOW_STANDARD_PORTS));
   EXPECT_TRUE(IsGoogleDomainUrl("http://google.com",
-                                google_util::DISALLOW_SUBDOMAIN));
+                                google_util::DISALLOW_SUBDOMAIN,
+                                google_util::ALLOW_STANDARD_PORTS));
   EXPECT_TRUE(IsGoogleDomainUrl("http://www.google.com",
-                                google_util::DISALLOW_SUBDOMAIN));
+                                google_util::DISALLOW_SUBDOMAIN,
+                                google_util::ALLOW_STANDARD_PORTS));
 
   // Port and scheme checks.
   EXPECT_TRUE(IsGoogleDomainUrl("http://www.google.com:80",
-                                google_util::DISALLOW_SUBDOMAIN));
+                                google_util::DISALLOW_SUBDOMAIN,
+                                google_util::ALLOW_STANDARD_PORTS));
   EXPECT_FALSE(IsGoogleDomainUrl("http://www.google.com:123",
-                                 google_util::DISALLOW_SUBDOMAIN));
+                                 google_util::DISALLOW_SUBDOMAIN,
+                                 google_util::ALLOW_STANDARD_PORTS));
   EXPECT_TRUE(IsGoogleDomainUrl("https://www.google.com:443",
-                                google_util::DISALLOW_SUBDOMAIN));
-  EXPECT_FALSE(IsGoogleDomainUrl("https://www.google.com:123",
-                                 google_util::DISALLOW_SUBDOMAIN));
+                                google_util::DISALLOW_SUBDOMAIN,
+                                google_util::ALLOW_STANDARD_PORTS));
+  EXPECT_FALSE(IsGoogleDomainUrl("http://www.google.com:123",
+                                 google_util::DISALLOW_SUBDOMAIN,
+                                 google_util::ALLOW_STANDARD_PORTS));
+  EXPECT_TRUE(IsGoogleDomainUrl("https://www.google.com:123",
+                                google_util::DISALLOW_SUBDOMAIN,
+                                google_util::ALLOW_ALL_PORTS));
+  EXPECT_TRUE(IsGoogleDomainUrl("https://www.google.com:123",
+                                google_util::DISALLOW_SUBDOMAIN,
+                                google_util::ALLOW_ALL_PORTS));
   EXPECT_FALSE(IsGoogleDomainUrl("file://www.google.com",
-                                 google_util::DISALLOW_SUBDOMAIN));
+                                 google_util::DISALLOW_SUBDOMAIN,
+                                 google_util::ALLOW_STANDARD_PORTS));
   EXPECT_FALSE(IsGoogleDomainUrl("doesnotexist://www.google.com",
-                                 google_util::DISALLOW_SUBDOMAIN));
+                                 google_util::DISALLOW_SUBDOMAIN,
+                                 google_util::ALLOW_STANDARD_PORTS));
 }
 
 TEST(GoogleUtilTest, SearchTerms) {