Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(307)

Unified Diff: chrome/browser/ssl/ssl_host_state.cc

Issue 2126005: Revert 47357 - Revert 47347 (Original patch reviewed at http://codereview.ch... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ssl/ssl_host_state.cc
===================================================================
--- chrome/browser/ssl/ssl_host_state.cc (revision 47426)
+++ chrome/browser/ssl/ssl_host_state.cc (working copy)
@@ -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() {
}
-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,

Powered by Google App Engine
This is Rietveld 408576698