summaryrefslogtreecommitdiffstats
path: root/net/base
diff options
context:
space:
mode:
authorcevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-22 19:55:01 +0000
committercevans@chromium.org <cevans@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-02-22 19:55:01 +0000
commitb9480af043fd6ea91fa22953a21edd1bd8b3c2e1 (patch)
tree56d8f3eb2e332a04632b2caf1a5006c48992c819 /net/base
parentf8ed6bd050a0d2173c3d83fb42928612fc127cb3 (diff)
downloadchromium_src-b9480af043fd6ea91fa22953a21edd1bd8b3c2e1.zip
chromium_src-b9480af043fd6ea91fa22953a21edd1bd8b3c2e1.tar.gz
chromium_src-b9480af043fd6ea91fa22953a21edd1bd8b3c2e1.tar.bz2
Add apis.google.com upon explicit request.
Review URL: https://chromiumcodereview.appspot.com/9431026 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@123091 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base')
-rw-r--r--net/base/transport_security_state.cc2
-rw-r--r--net/base/transport_security_state_unittest.cc2
2 files changed, 4 insertions, 0 deletions
diff --git a/net/base/transport_security_state.cc b/net/base/transport_security_state.cc
index 4830624..7118cbb 100644
--- a/net/base/transport_security_state.cc
+++ b/net/base/transport_security_state.cc
@@ -1329,6 +1329,8 @@ static const struct HSTSPreload kPreloadedSTS[] = {
DOMAIN_GOOGLEPLEX_COM },
{19, true, "\006groups\006google\003com", true, kGooglePins,
DOMAIN_GOOGLE_COM },
+ {17, true, "\004apis\006google\003com", true, kGooglePins,
+ DOMAIN_GOOGLE_COM },
// Other Google-related domains that must use an acceptable certificate
// iff using SSL.
{11, true, "\005ytimg\003com", false, kGooglePins,
diff --git a/net/base/transport_security_state_unittest.cc b/net/base/transport_security_state_unittest.cc
index 07d1f21..a5bcd89 100644
--- a/net/base/transport_security_state_unittest.cc
+++ b/net/base/transport_security_state_unittest.cc
@@ -607,6 +607,7 @@ TEST_F(TransportSecurityStateTest, Preloaded) {
EXPECT_TRUE(ShouldRedirect("talk.google.com"));
EXPECT_TRUE(ShouldRedirect("plus.google.com"));
EXPECT_TRUE(ShouldRedirect("groups.google.com"));
+ EXPECT_TRUE(ShouldRedirect("apis.google.com"));
EXPECT_TRUE(ShouldRedirect("ssl.google-analytics.com"));
EXPECT_TRUE(ShouldRedirect("gmail.com"));
EXPECT_TRUE(ShouldRedirect("www.gmail.com"));
@@ -899,6 +900,7 @@ TEST_F(TransportSecurityStateTest, BuiltinCertPins) {
EXPECT_TRUE(state.HasPinsForHost(&domain_state, "talk.google.com", true));
EXPECT_TRUE(state.HasPinsForHost(&domain_state, "plus.google.com", true));
EXPECT_TRUE(state.HasPinsForHost(&domain_state, "groups.google.com", true));
+ EXPECT_TRUE(state.HasPinsForHost(&domain_state, "apis.google.com", true));
EXPECT_TRUE(state.HasPinsForHost(&domain_state, "ssl.gstatic.com", true));
EXPECT_FALSE(state.HasPinsForHost(&domain_state, "www.gstatic.com", true));