| Index: chrome/browser/ssl/chrome_ssl_host_state_delegate.cc
|
| diff --git a/chrome/browser/ssl/chrome_ssl_host_state_delegate.cc b/chrome/browser/ssl/chrome_ssl_host_state_delegate.cc
|
| index 7d2fdfe27313ed2b82b05e905545eb20ded06ad9..f6e31e05d74e600f8da202789f65d9e96a4fb207 100644
|
| --- a/chrome/browser/ssl/chrome_ssl_host_state_delegate.cc
|
| +++ b/chrome/browser/ssl/chrome_ssl_host_state_delegate.cc
|
| @@ -434,15 +434,33 @@ bool ChromeSSLHostStateDelegate::HasAllowException(
|
| return false;
|
| }
|
|
|
| -void ChromeSSLHostStateDelegate::HostRanInsecureContent(const std::string& host,
|
| - int pid) {
|
| - ran_insecure_content_hosts_.insert(BrokenHostEntry(host, pid));
|
| +void ChromeSSLHostStateDelegate::HostRanInsecureContent(
|
| + const std::string& host,
|
| + int pid,
|
| + InsecureContentType content_type) {
|
| + switch (content_type) {
|
| + case MIXED_CONTENT:
|
| + ran_mixed_content_hosts_.insert(BrokenHostEntry(host, pid));
|
| + return;
|
| + case CERT_ERRORS_CONTENT:
|
| + ran_content_with_cert_errors_hosts_.insert(BrokenHostEntry(host, pid));
|
| + return;
|
| + }
|
| }
|
|
|
| bool ChromeSSLHostStateDelegate::DidHostRunInsecureContent(
|
| const std::string& host,
|
| - int pid) const {
|
| - return !!ran_insecure_content_hosts_.count(BrokenHostEntry(host, pid));
|
| + int pid,
|
| + InsecureContentType content_type) const {
|
| + switch (content_type) {
|
| + case MIXED_CONTENT:
|
| + return !!ran_mixed_content_hosts_.count(BrokenHostEntry(host, pid));
|
| + case CERT_ERRORS_CONTENT:
|
| + return !!ran_content_with_cert_errors_hosts_.count(
|
| + BrokenHostEntry(host, pid));
|
| + }
|
| + NOTREACHED();
|
| + return false;
|
| }
|
| void ChromeSSLHostStateDelegate::SetClock(std::unique_ptr<base::Clock> clock) {
|
| clock_.reset(clock.release());
|
|
|