diff options
| author | palmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-08 23:02:26 +0000 |
|---|---|---|
| committer | palmer@chromium.org <palmer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-07-08 23:02:26 +0000 |
| commit | 36ffb32be724ad70c378cd3df4cc788c944c3a00 (patch) | |
| tree | 5706c59b781f67f3df1eb788544f1ab7f14e5abb /net/http | |
| parent | a9adca5f50df363c59aa54c770267a70aa6e9b90 (diff) | |
| download | chromium_src-36ffb32be724ad70c378cd3df4cc788c944c3a00.zip chromium_src-36ffb32be724ad70c378cd3df4cc788c944c3a00.tar.gz chromium_src-36ffb32be724ad70c378cd3df4cc788c944c3a00.tar.bz2 | |
Reenable UpdateDynamicPKPMaxAge0 test.
BUG=375538
Review URL: https://codereview.chromium.org/293253002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@281863 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/http')
| -rw-r--r-- | net/http/http_security_headers_unittest.cc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/net/http/http_security_headers_unittest.cc b/net/http/http_security_headers_unittest.cc index ce919ff..bf1bcfb 100644 --- a/net/http/http_security_headers_unittest.cc +++ b/net/http/http_security_headers_unittest.cc @@ -572,13 +572,7 @@ TEST_F(HttpSecurityHeadersTest, UpdateDynamicPKPOnly) { EXPECT_NE(new_dynamic_domain_state.pkp.spki_hashes.end(), hash); } -// Failing on win_chromium_rel. crbug.com/375538 -#if defined(OS_WIN) -#define MAYBE_UpdateDynamicPKPMaxAge0 DISABLED_UpdateDynamicPKPMaxAge0 -#else -#define MAYBE_UpdateDynamicPKPMaxAge0 UpdateDynamicPKPMaxAge0 -#endif -TEST_F(HttpSecurityHeadersTest, MAYBE_UpdateDynamicPKPMaxAge0) { +TEST_F(HttpSecurityHeadersTest, UpdateDynamicPKPMaxAge0) { TransportSecurityState state; TransportSecurityState::DomainState static_domain_state; @@ -652,7 +646,6 @@ TEST_F(HttpSecurityHeadersTest, MAYBE_UpdateDynamicPKPMaxAge0) { domain, true, new_static_domain_state2.pkp.spki_hashes, &failure_log)); EXPECT_NE(0UL, failure_log.length()); } -#undef MAYBE_UpdateDynamicPKPMaxAge0 // Tests that when a static HSTS and a static HPKP entry are present, adding a // dynamic HSTS header does not clobber the static HPKP entry. Further, adding a |