Revert 224269 "Don't persist HPKP if PrivacyMode is enabled."

trunk/src/net/http/http_security_headers_unittest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <algorithm>
 
 #include "base/base64.h"
 #include "base/sha1.h"
 #include "base/strings/string_piece.h"
 #include "crypto/sha2.h"
@@ skipping 422 matching lines @@
 TEST_F(HttpSecurityHeadersTest, ValidPKPHeadersSHA256) {
   TestValidPKPHeaders(HASH_VALUE_SHA256);
 }
 
 TEST_F(HttpSecurityHeadersTest, UpdateDynamicPKPOnly) {
   TransportSecurityState state;
   TransportSecurityState::DomainState domain_state;
 
   // docs.google.com has preloaded pins.
   std::string domain = "docs.google.com";
-  EXPECT_TRUE(state.GetDomainState(domain, true, true, &domain_state));
+  EXPECT_TRUE(state.GetDomainState(domain, true, &domain_state));
   EXPECT_GT(domain_state.static_spki_hashes.size(), 1UL);
   HashValueVector saved_hashes = domain_state.static_spki_hashes;
 
   // Add a header, which should only update the dynamic state.
   HashValue good_hash = GetTestHashValue(1, HASH_VALUE_SHA1);
   HashValue backup_hash = GetTestHashValue(2, HASH_VALUE_SHA1);
   std::string good_pin = GetTestPin(1, HASH_VALUE_SHA1);
   std::string backup_pin = GetTestPin(2, HASH_VALUE_SHA1);
   std::string header = "max-age = 10000; " + good_pin + "; " + backup_pin;
 
@@ skipping 26 matching lines @@
       HashValuesEqual(good_hash));
   EXPECT_NE(dynamic_domain_state.dynamic_spki_hashes.end(), hash);
 
   hash = std::find_if(
       dynamic_domain_state.dynamic_spki_hashes.begin(),
       dynamic_domain_state.dynamic_spki_hashes.end(),
       HashValuesEqual(backup_hash));
   EXPECT_NE(dynamic_domain_state.dynamic_spki_hashes.end(), hash);
 
   // Expect the overall state to reflect the header, too.
-  EXPECT_TRUE(state.GetDomainState(domain, true, true, &domain_state));
+  EXPECT_TRUE(state.GetDomainState(domain, true, &domain_state));
   EXPECT_EQ(2UL, domain_state.dynamic_spki_hashes.size());
 
   hash = std::find_if(domain_state.dynamic_spki_hashes.begin(),
                       domain_state.dynamic_spki_hashes.end(),
                       HashValuesEqual(good_hash));
   EXPECT_NE(domain_state.dynamic_spki_hashes.end(), hash);
 
   hash = std::find_if(
       domain_state.dynamic_spki_hashes.begin(),
       domain_state.dynamic_spki_hashes.end(),
       HashValuesEqual(backup_hash));
   EXPECT_NE(domain_state.dynamic_spki_hashes.end(), hash);
 }
 
 };    // namespace net