diff options
| author | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 18:07:19 +0000 |
|---|---|---|
| committer | agl@chromium.org <agl@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-12-06 18:07:19 +0000 |
| commit | e61ee7d331b036aadd607349e3018955746b3125 (patch) | |
| tree | db8b5ea97cd867051dad31217dfc3b995f7563c1 /net/base/transport_security_state_unittest.cc | |
| parent | 103dccfa2877fed72cdcd7daafba3c81a51ab923 (diff) | |
| download | chromium_src-e61ee7d331b036aadd607349e3018955746b3125.zip chromium_src-e61ee7d331b036aadd607349e3018955746b3125.tar.gz chromium_src-e61ee7d331b036aadd607349e3018955746b3125.tar.bz2 | |
Revert "net: reenable Twitter's public key pins with api.twitter.com using the CDN pins."
This reverts commit r113203. It failed on the ChromeOS valgrind and heapcheck bots.
BUG=113203
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113229 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/base/transport_security_state_unittest.cc')
| -rw-r--r-- | net/base/transport_security_state_unittest.cc | 18 |
1 files changed, 14 insertions, 4 deletions
diff --git a/net/base/transport_security_state_unittest.cc b/net/base/transport_security_state_unittest.cc index 959805e..b5f3c4d 100644 --- a/net/base/transport_security_state_unittest.cc +++ b/net/base/transport_security_state_unittest.cc @@ -580,10 +580,18 @@ TEST_F(TransportSecurityStateTest, Preloaded) { EXPECT_TRUE(ShouldRedirect("ubertt.org")); EXPECT_TRUE(ShouldRedirect("foo.ubertt.org")); - - EXPECT_FALSE(ShouldRedirect("twitter.com")); - EXPECT_FALSE(ShouldRedirect("www.twitter.com")); - EXPECT_TRUE(HasPins("www.twitter.com")); +#if 0 + // Currently disabled to debug Twitter public key pins --agl +#if defined(OS_CHROMEOS) + EXPECT_TRUE(state.GetDomainState(&domain_state, + "twitter.com", + false)); +#else + EXPECT_FALSE(state.GetDomainState(&domain_state, + "twitter.com", + false)); +#endif +#endif } TEST_F(TransportSecurityStateTest, LongNames) { @@ -684,6 +692,7 @@ TEST_F(TransportSecurityStateTest, BuiltinCertPins) { true)); EXPECT_TRUE(state.HasPinsForHost(&domain_state, "www.googleplex.com", true)); +#if 0 // Disabled in order to help track down pinning failures --agl EXPECT_TRUE(state.HasPinsForHost(&domain_state, "twitter.com", true)); EXPECT_FALSE(state.HasPinsForHost(&domain_state, "foo.twitter.com", true)); @@ -696,6 +705,7 @@ TEST_F(TransportSecurityStateTest, BuiltinCertPins) { EXPECT_TRUE(state.HasPinsForHost(&domain_state, "platform.twitter.com", true)); EXPECT_TRUE(state.HasPinsForHost(&domain_state, "si0.twimg.com", true)); EXPECT_TRUE(state.HasPinsForHost(&domain_state, "twimg0-a.akamaihd.net", true)); +#endif } static bool AddHash(const std::string& type_and_base64, |