| Index: chrome/browser/ssl/chrome_ssl_host_state_delegate.h
|
| diff --git a/chrome/browser/ssl/chrome_ssl_host_state_delegate.h b/chrome/browser/ssl/chrome_ssl_host_state_delegate.h
|
| index 05d194e7c358c29bb0a7865944d392a8eaac3534..37c32ee729cf58bb2614253467437721ee16e4d7 100644
|
| --- a/chrome/browser/ssl/chrome_ssl_host_state_delegate.h
|
| +++ b/chrome/browser/ssl/chrome_ssl_host_state_delegate.h
|
| @@ -38,22 +38,8 @@ class ChromeSSLHostStateDelegate : public content::SSLHostStateDelegate {
|
| virtual net::CertPolicy::Judgment QueryPolicy(const std::string& host,
|
| net::X509Certificate* cert,
|
| net::CertStatus error) OVERRIDE;
|
| - virtual void HostRanInsecureContent(const std::string& host,
|
| - int pid) OVERRIDE;
|
| - virtual bool DidHostRunInsecureContent(const std::string& host,
|
| - int pid) const OVERRIDE;
|
| -
|
| - // ChromeSSLHostStateDelegate implementation:
|
| - // Revoke all user decisions for |host| in the given Profile. The
|
| - // RevokeUserDecisionsHard version may close idle connections in the process.
|
| - // This version should be used *only* for rare events, such as a user
|
| - // controlled button, as it may be very disruptive to the networking stack.
|
| - virtual void RevokeUserDecisions(const std::string& host);
|
| - virtual void RevokeUserDecisionsHard(const std::string& host);
|
| -
|
| - // Returns true if any decisions has been recorded for |host| for the given
|
| - // Profile, otherwise false.
|
| - virtual bool HasUserDecision(const std::string& host);
|
| + virtual void RevokeAllowAndDenyPreferences(const std::string& host) OVERRIDE;
|
| + virtual bool HasAllowedOrDeniedCert(const std::string& host) OVERRIDE;
|
|
|
| // Called on the UI thread when the profile is about to be destroyed.
|
| void ShutdownOnUIThread() {}
|
| @@ -114,15 +100,6 @@ class ChromeSSLHostStateDelegate : public content::SSLHostStateDelegate {
|
| base::TimeDelta default_ssl_cert_decision_expiration_delta_;
|
| Profile* profile_;
|
|
|
| - // A BrokenHostEntry is a pair of (host, process_id) that indicates the host
|
| - // contains insecure content in that renderer process.
|
| - typedef std::pair<std::string, int> BrokenHostEntry;
|
| -
|
| - // Hosts which have been contaminated with insecure content in the
|
| - // specified process. Note that insecure content can travel between
|
| - // same-origin frames in one processs but cannot jump between processes.
|
| - std::set<BrokenHostEntry> ran_insecure_content_hosts_;
|
| -
|
| DISALLOW_COPY_AND_ASSIGN(ChromeSSLHostStateDelegate);
|
| };
|
|
|
|
|