| Index: net/base/transport_security_state.h
|
| diff --git a/net/base/transport_security_state.h b/net/base/transport_security_state.h
|
| index 768ccbbc7c57774e405c524c52628c7143aec79d..05061ca69916b80d8f44c22271b0b1161a8d258f 100644
|
| --- a/net/base/transport_security_state.h
|
| +++ b/net/base/transport_security_state.h
|
| @@ -47,17 +47,26 @@ class TransportSecurityState :
|
| DomainState()
|
| : mode(MODE_STRICT),
|
| created(base::Time::Now()),
|
| - include_subdomains(false) { }
|
| + include_subdomains(false),
|
| + preloaded(false) { }
|
|
|
| Mode mode;
|
| base::Time created; // when this host entry was first created
|
| base::Time expiry; // the absolute time (UTC) when this record expires
|
| bool include_subdomains; // subdomains included?
|
| +
|
| + // The follow members are not valid when stored in |enabled_hosts_|.
|
| + bool preloaded; // is this a preloaded entry?
|
| + std::string domain; // the domain which matched
|
| };
|
|
|
| // Enable TransportSecurity for |host|.
|
| void EnableHost(const std::string& host, const DomainState& state);
|
|
|
| + // Delete any entry for |host|. If |host| doesn't have an exact entry then no
|
| + // action is taken. Returns true iff an entry was deleted.
|
| + bool DeleteHost(const std::string& host);
|
| +
|
| // Returns true if |host| has TransportSecurity enabled. If that case,
|
| // *result is filled out.
|
| bool IsEnabledForHost(DomainState* result, const std::string& host);
|
| @@ -101,8 +110,8 @@ class TransportSecurityState :
|
| // our state is dirty.
|
| void DirtyNotify();
|
|
|
| - static std::string CanonicaliseHost(const std::string& host);
|
| - static bool IsPreloadedSTS(const std::string& canonicalised_host,
|
| + static std::string CanonicalizeHost(const std::string& host);
|
| + static bool IsPreloadedSTS(const std::string& canonicalized_host,
|
| bool* out_include_subdomains);
|
|
|
| // The set of hosts that have enabled TransportSecurity. The keys here
|
|
|