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

trunk/src/net/http/transport_security_state.h

 // 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.
 
 #ifndef NET_HTTP_TRANSPORT_SECURITY_STATE_H_
 #define NET_HTTP_TRANSPORT_SECURITY_STATE_H_
 
 #include <map>
 #include <string>
 #include <utility>
@@ skipping 183 matching lines @@
   // If an entry is deleted, the new state will be persisted through
   // the Delegate (if any).
   bool DeleteDynamicDataForHost(const std::string& host);
 
   // Returns true and updates |*result| iff there is a DomainState for
   // |host|.
   //
   // If |sni_enabled| is true, searches the static pins defined for
   // SNI-using hosts as well as the rest of the pins.
   //
-  // If |allow_dynamic| is true, then dynamic state is returned if present,
-  // otherwise only static state is used..
-  //
   // If |host| matches both an exact entry and is a subdomain of another
   // entry, the exact match determines the return value.
   //
   // Note that this method is not const because it opportunistically removes
   // entries that have expired.
   bool GetDomainState(const std::string& host,
                       bool sni_enabled,
-                      bool allow_dynamic,
                       DomainState* result);
 
   // Processes an HSTS header value from the host, adding entries to
   // dynamic state if necessary.
   bool AddHSTSHeader(const std::string& host, const std::string& value);
 
   // Processes an HPKP header value from the host, adding entries to
   // dynamic state if necessary.  ssl_info is used to check that
   // the specified pins overlap with the certificate chain.
   bool AddHPKPHeader(const std::string& host, const std::string& value,
@@ skipping 98 matching lines @@
   DomainStateMap enabled_hosts_;
 
   Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(TransportSecurityState);
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_TRANSPORT_SECURITY_STATE_H_