summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authoragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-26 17:17:39 +0000
committeragl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-01-26 17:17:39 +0000
commit7efbb259c8f252b000650ac494242b79d74ee8c1 (patch)
treeb7ae62b960863a48bc67bac1ddcd7ffd0f79d05e /net
parent4ec1766c6e48f235f2c67c705008cc73b61d5a31 (diff)
downloadchromium_src-7efbb259c8f252b000650ac494242b79d74ee8c1.zip
chromium_src-7efbb259c8f252b000650ac494242b79d74ee8c1.tar.gz
chromium_src-7efbb259c8f252b000650ac494242b79d74ee8c1.tar.bz2
Don't force groups.google.com to HTTPS.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@119250 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/base/transport_security_state.cc2
-rw-r--r--net/base/transport_security_state_unittest.cc2
2 files changed, 2 insertions, 2 deletions
diff --git a/net/base/transport_security_state.cc b/net/base/transport_security_state.cc
index f3668a2..ed3778f 100644
--- a/net/base/transport_security_state.cc
+++ b/net/base/transport_security_state.cc
@@ -1323,7 +1323,7 @@ static const struct HSTSPreload kPreloadedSTS[] = {
DOMAIN_GOOGLE_COM },
{16, true, "\012googleplex\003com", true, kGooglePins,
DOMAIN_GOOGLEPLEX_COM },
- {19, true, "\006groups\006google\003com", true, kGooglePins,
+ {19, true, "\006groups\006google\003com", false, kGooglePins,
DOMAIN_GOOGLE_COM },
// Other Google-related domains that must use an acceptable certificate
// iff using SSL.
diff --git a/net/base/transport_security_state_unittest.cc b/net/base/transport_security_state_unittest.cc
index 07d1f21..596504a 100644
--- a/net/base/transport_security_state_unittest.cc
+++ b/net/base/transport_security_state_unittest.cc
@@ -606,7 +606,7 @@ TEST_F(TransportSecurityStateTest, Preloaded) {
EXPECT_TRUE(ShouldRedirect("hostedtalkgadget.google.com"));
EXPECT_TRUE(ShouldRedirect("talk.google.com"));
EXPECT_TRUE(ShouldRedirect("plus.google.com"));
- EXPECT_TRUE(ShouldRedirect("groups.google.com"));
+ EXPECT_FALSE(ShouldRedirect("groups.google.com"));
EXPECT_TRUE(ShouldRedirect("ssl.google-analytics.com"));
EXPECT_TRUE(ShouldRedirect("gmail.com"));
EXPECT_TRUE(ShouldRedirect("www.gmail.com"));