diff options
author | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-20 03:54:03 +0000 |
---|---|---|
committer | tkent@chromium.org <tkent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-09-20 03:54:03 +0000 |
commit | 22e045faa6bc1faa16b5664aa896e9c107851761 (patch) | |
tree | 2051918751d9053de984b61b8ac3ed2d2ee92006 /chrome_frame | |
parent | d9343b3e87b143d3438eddabc3a9eeec65d39bd0 (diff) | |
download | chromium_src-22e045faa6bc1faa16b5664aa896e9c107851761.zip chromium_src-22e045faa6bc1faa16b5664aa896e9c107851761.tar.gz chromium_src-22e045faa6bc1faa16b5664aa896e9c107851761.tar.bz2 |
Revert 224269 "Don't persist HPKP if PrivacyMode is enabled."
It broke Google Chrome ChromeOS bot.
http://build.chromium.org/p/chromium.chrome/builders/Google%20Chrome%20ChromeOS/builds/58548/steps/compile/logs/stdio#error1
FAILED: g++ ... -c ../../net/socket/ssl_client_socket_nss.cc -o obj/net/socket/net.ssl_client_socket_nss.o
../../net/socket/ssl_client_socket_nss.cc: In member function 'int net::SSLClientSocketNSS::DoVerifyCertComplete(int)':
../../net/socket/ssl_client_socket_nss.cc:3445:64:error: no matching function for call to 'net::TransportSecurityState::GetDomainState(const string&, bool&, net::TransportSecurityState::DomainState*)'
../../net/socket/ssl_client_socket_nss.cc:3445:64: note: candidate is:
../../net/http/transport_security_state.h:212:8: note: bool net::TransportSecurityState::GetDomainState(const string&, bool, bool, net::TransportSecurityState::DomainState*)
../../net/http/transport_security_state.h:212:8: note: candidate expects 4 arguments, 3 provided
> Don't persist HPKP if PrivacyMode is enabled.
>
> BUG=258667
>
> Review URL: https://chromiumcodereview.appspot.com/19269012
TBR=mef@chromium.org
Review URL: https://codereview.chromium.org/24251011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@224275 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome_frame')
-rw-r--r-- | chrome_frame/test/net/fake_external_tab.cc | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/chrome_frame/test/net/fake_external_tab.cc b/chrome_frame/test/net/fake_external_tab.cc index 9878755..bcc7792 100644 --- a/chrome_frame/test/net/fake_external_tab.cc +++ b/chrome_frame/test/net/fake_external_tab.cc @@ -264,7 +264,6 @@ void FilterDisabledTests() { // functionality they test (HTTP Strict Transport Security and // HTTP-based Public Key Pinning) does not work in Chrome Frame anyway. "URLRequestTestHTTP.ProcessPKP", - "URLRequestTestHTTP.ProcessPKP_PrivacyMode", "URLRequestTestHTTP.ProcessSTS", "URLRequestTestHTTP.ProcessSTSOnce", "URLRequestTestHTTP.ProcessSTSAndPKP", |