diff options
Diffstat (limited to 'chrome/browser/ssl/ssl_host_state.cc')
-rw-r--r-- | chrome/browser/ssl/ssl_host_state.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/chrome/browser/ssl/ssl_host_state.cc b/chrome/browser/ssl/ssl_host_state.cc index 7e6d3cc..e12c458 100644 --- a/chrome/browser/ssl/ssl_host_state.cc +++ b/chrome/browser/ssl/ssl_host_state.cc @@ -1,4 +1,4 @@ -// Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. +// Copyright (c) 2010 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. @@ -23,22 +23,21 @@ SSLHostState::SSLHostState() { SSLHostState::~SSLHostState() { } -void SSLHostState::MarkHostAsBroken(const std::string& host, int pid) { +void SSLHostState::HostRanInsecureContent(const std::string& host, int pid) { DCHECK(CalledOnValidThread()); - - broken_hosts_.insert(BrokenHostEntry(host, pid)); + ran_insecure_content_hosts_.insert(BrokenHostEntry(host, pid)); } -bool SSLHostState::DidMarkHostAsBroken(const std::string& host, int pid) { +bool SSLHostState::DidHostRunInsecureContent(const std::string& host, + int pid) const { DCHECK(CalledOnValidThread()); - // CAs issue certificate for intranet hosts to everyone. Therefore, we always - // treat intranet hosts as broken. + // CAs issue certificates for intranet hosts to everyone. Therefore, we + // always treat intranet hosts as having run insecure content. if (IsIntranetHost(host)) return true; - return (broken_hosts_.find( - BrokenHostEntry(host, pid)) != broken_hosts_.end()); + return !!ran_insecure_content_hosts_.count(BrokenHostEntry(host, pid)); } void SSLHostState::DenyCertForHost(net::X509Certificate* cert, |