Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(259)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/browser/google/google_util_unittest.cc

Issue 10908028: Allow the X-Chrome-Variations header to transmit to all ports. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: rebase Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/google/google_util.cc ('k') | chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 96d1dc563e7bd8c184ab8cfa0a5d16bb3c1ea236..174b91cd5e91103d3c9eec648767da721702324f 100644
--- a/chrome/browser/google/google_util_unittest.cc
+++ b/chrome/browser/google/google_util_unittest.cc
@@ -279,65 +279,102 @@ 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::DISALLOW_NON_STANDARD_PORTS));
EXPECT_TRUE(IsGoogleDomainUrl("http://google.com",
- google_util::ALLOW_SUBDOMAIN));
+ google_util::ALLOW_SUBDOMAIN,
+ google_util::DISALLOW_NON_STANDARD_PORTS));
EXPECT_TRUE(IsGoogleDomainUrl("http://www.google.ca",
- google_util::ALLOW_SUBDOMAIN));
+ google_util::ALLOW_SUBDOMAIN,
+ google_util::DISALLOW_NON_STANDARD_PORTS));
EXPECT_TRUE(IsGoogleDomainUrl("http://www.google.biz.tj",
- google_util::ALLOW_SUBDOMAIN));
+ google_util::ALLOW_SUBDOMAIN,
+ google_util::DISALLOW_NON_STANDARD_PORTS));
EXPECT_TRUE(IsGoogleDomainUrl("http://www.google.com/search?q=something",
- google_util::ALLOW_SUBDOMAIN));
+ google_util::ALLOW_SUBDOMAIN,
+ google_util::DISALLOW_NON_STANDARD_PORTS));
EXPECT_TRUE(IsGoogleDomainUrl("http://www.google.com/webhp",
- google_util::ALLOW_SUBDOMAIN));
+ google_util::ALLOW_SUBDOMAIN,
+ google_util::DISALLOW_NON_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::DISALLOW_NON_STANDARD_PORTS));
EXPECT_FALSE(IsGoogleDomainUrl("http://www.google.faketld/search?q=something",
- google_util::ALLOW_SUBDOMAIN));
+ google_util::ALLOW_SUBDOMAIN,
+ google_util::DISALLOW_NON_STANDARD_PORTS));
EXPECT_FALSE(IsGoogleDomainUrl("http://www.yahoo.com",
- google_util::ALLOW_SUBDOMAIN));
+ google_util::ALLOW_SUBDOMAIN,
+ google_util::DISALLOW_NON_STANDARD_PORTS));
// Test subdomain checks.
EXPECT_TRUE(IsGoogleDomainUrl("http://images.google.com",
- google_util::ALLOW_SUBDOMAIN));
+ google_util::ALLOW_SUBDOMAIN,
+ google_util::DISALLOW_NON_STANDARD_PORTS));
EXPECT_FALSE(IsGoogleDomainUrl("http://images.google.com",
- google_util::DISALLOW_SUBDOMAIN));
+ google_util::DISALLOW_SUBDOMAIN,
+ google_util::DISALLOW_NON_STANDARD_PORTS));
EXPECT_TRUE(IsGoogleDomainUrl("http://google.com",
- google_util::DISALLOW_SUBDOMAIN));
+ google_util::DISALLOW_SUBDOMAIN,
+ google_util::DISALLOW_NON_STANDARD_PORTS));
EXPECT_TRUE(IsGoogleDomainUrl("http://www.google.com",
- google_util::DISALLOW_SUBDOMAIN));
+ google_util::DISALLOW_SUBDOMAIN,
+ google_util::DISALLOW_NON_STANDARD_PORTS));
// Port and scheme checks.
EXPECT_TRUE(IsGoogleDomainUrl("http://www.google.com:80",
- google_util::DISALLOW_SUBDOMAIN));
+ google_util::DISALLOW_SUBDOMAIN,
+ google_util::DISALLOW_NON_STANDARD_PORTS));
EXPECT_FALSE(IsGoogleDomainUrl("http://www.google.com:123",
- google_util::DISALLOW_SUBDOMAIN));
+ google_util::DISALLOW_SUBDOMAIN,
+ google_util::DISALLOW_NON_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::DISALLOW_NON_STANDARD_PORTS));
+ EXPECT_FALSE(IsGoogleDomainUrl("http://www.google.com:123",
+ google_util::DISALLOW_SUBDOMAIN,
+ google_util::DISALLOW_NON_STANDARD_PORTS));
+ EXPECT_TRUE(IsGoogleDomainUrl("http://www.google.com:123",
+ google_util::DISALLOW_SUBDOMAIN,
+ google_util::ALLOW_NON_STANDARD_PORTS));
+ EXPECT_TRUE(IsGoogleDomainUrl("https://www.google.com:123",
+ google_util::DISALLOW_SUBDOMAIN,
+ google_util::ALLOW_NON_STANDARD_PORTS));
+ EXPECT_TRUE(IsGoogleDomainUrl("http://www.google.com:80",
+ google_util::DISALLOW_SUBDOMAIN,
+ google_util::ALLOW_NON_STANDARD_PORTS));
+ EXPECT_TRUE(IsGoogleDomainUrl("https://www.google.com:443",
+ google_util::DISALLOW_SUBDOMAIN,
+ google_util::ALLOW_NON_STANDARD_PORTS));
EXPECT_FALSE(IsGoogleDomainUrl("file://www.google.com",
- google_util::DISALLOW_SUBDOMAIN));
+ google_util::DISALLOW_SUBDOMAIN,
+ google_util::DISALLOW_NON_STANDARD_PORTS));
EXPECT_FALSE(IsGoogleDomainUrl("doesnotexist://www.google.com",
- google_util::DISALLOW_SUBDOMAIN));
+ google_util::DISALLOW_SUBDOMAIN,
+ google_util::DISALLOW_NON_STANDARD_PORTS));
// Test overriding with --instant-url works.
EXPECT_FALSE(IsGoogleDomainUrl("http://test.foo.com",
- google_util::DISALLOW_SUBDOMAIN));
+ google_util::DISALLOW_SUBDOMAIN,
+ google_util::DISALLOW_NON_STANDARD_PORTS));
EXPECT_FALSE(IsGoogleDomainUrl("http://test.foo.com:1234",
- google_util::DISALLOW_SUBDOMAIN));
+ google_util::DISALLOW_SUBDOMAIN,
+ google_util::DISALLOW_NON_STANDARD_PORTS));
CommandLine::ForCurrentProcess()->AppendSwitchASCII(
switches::kInstantURL, "http://test.foo.com:1234/bar");
EXPECT_FALSE(IsGoogleDomainUrl("http://test.foo.com",
- google_util::DISALLOW_SUBDOMAIN));
+ google_util::DISALLOW_SUBDOMAIN,
+ google_util::DISALLOW_NON_STANDARD_PORTS));
EXPECT_TRUE(IsGoogleDomainUrl("http://test.foo.com:1234",
- google_util::DISALLOW_SUBDOMAIN));
+ google_util::DISALLOW_SUBDOMAIN,
+ google_util::DISALLOW_NON_STANDARD_PORTS));
EXPECT_FALSE(IsGoogleDomainUrl("file://test.foo.com:1234",
- google_util::DISALLOW_SUBDOMAIN));
+ google_util::DISALLOW_SUBDOMAIN,
+ google_util::DISALLOW_NON_STANDARD_PORTS));
EXPECT_TRUE(IsGoogleDomainUrl("http://www.google.com",
- google_util::DISALLOW_SUBDOMAIN));
+ google_util::DISALLOW_SUBDOMAIN,
+ google_util::DISALLOW_NON_STANDARD_PORTS));
}
TEST(GoogleUtilTest, SearchTerms) {
« no previous file with comments | « chrome/browser/google/google_util.cc ('k') | chrome/browser/renderer_host/chrome_resource_dispatcher_host_delegate.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698