| Index: net/http/transport_security_state.h
|
| diff --git a/net/http/transport_security_state.h b/net/http/transport_security_state.h
|
| index 82a3c45817c3ebe31f145660088b542354545afa..7c1aafd0e0180e7655a795cdb856102c0c0dcb5c 100644
|
| --- a/net/http/transport_security_state.h
|
| +++ b/net/http/transport_security_state.h
|
| @@ -224,18 +224,22 @@ class NET_EXPORT TransportSecurityState
|
| // 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,
|
| + bool AddHPKPHeader(const std::string& host,
|
| + const std::string& value,
|
| const SSLInfo& ssl_info);
|
|
|
| // Adds explicitly-specified data as if it was processed from an
|
| // HSTS header (used for net-internals and unit tests).
|
| - bool AddHSTS(const std::string& host, const base::Time& expiry,
|
| + bool AddHSTS(const std::string& host,
|
| + const base::Time& expiry,
|
| bool include_subdomains);
|
|
|
| // Adds explicitly-specified data as if it was processed from an
|
| // HPKP header (used for net-internals and unit tests).
|
| - bool AddHPKP(const std::string& host, const base::Time& expiry,
|
| - bool include_subdomains, const HashValueVector& hashes);
|
| + bool AddHPKP(const std::string& host,
|
| + const base::Time& expiry,
|
| + bool include_subdomains,
|
| + const HashValueVector& hashes);
|
|
|
| // Returns true iff we have any static public key pins for the |host| and
|
| // iff its set of required pins is the set we expect for Google
|
| @@ -246,8 +250,7 @@ class NET_EXPORT TransportSecurityState
|
| //
|
| // If |host| matches both an exact entry and is a subdomain of another
|
| // entry, the exact match determines the return value.
|
| - static bool IsGooglePinnedProperty(const std::string& host,
|
| - bool sni_enabled);
|
| + static bool IsGooglePinnedProperty(const std::string& host, bool sni_enabled);
|
|
|
| // The maximum number of seconds for which we'll cache an HSTS request.
|
| static const long int kMaxHSTSAgeSecs;
|
| @@ -269,8 +272,7 @@ class NET_EXPORT TransportSecurityState
|
|
|
| private:
|
| friend class TransportSecurityStateTest;
|
| - FRIEND_TEST_ALL_PREFIXES(HttpSecurityHeadersTest,
|
| - UpdateDynamicPKPOnly);
|
| + FRIEND_TEST_ALL_PREFIXES(HttpSecurityHeadersTest, UpdateDynamicPKPOnly);
|
|
|
| typedef std::map<std::string, DomainState> DomainStateMap;
|
|
|
|
|