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

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

Issue 2095006: Revert 47347 - (Original patch reviewed at http://codereview.chromium.org/206... (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
« no previous file with comments | « chrome/browser/ssl/ssl_host_state.h ('k') | chrome/browser/ssl/ssl_host_state_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ssl/ssl_host_state.cc
===================================================================
--- chrome/browser/ssl/ssl_host_state.cc (revision 47356)
+++ chrome/browser/ssl/ssl_host_state.cc (working copy)
@@ -1,4 +1,4 @@
-// Copyright (c) 2010 The Chromium Authors. All rights reserved.
+// Copyright (c) 2006-2009 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,21 +23,22 @@
SSLHostState::~SSLHostState() {
}
-void SSLHostState::HostRanInsecureContent(const std::string& host, int pid) {
+void SSLHostState::MarkHostAsBroken(const std::string& host, int pid) {
DCHECK(CalledOnValidThread());
- ran_insecure_content_hosts_.insert(BrokenHostEntry(host, pid));
+
+ broken_hosts_.insert(BrokenHostEntry(host, pid));
}
-bool SSLHostState::DidHostRunInsecureContent(const std::string& host,
- int pid) const {
+bool SSLHostState::DidMarkHostAsBroken(const std::string& host, int pid) {
DCHECK(CalledOnValidThread());
- // CAs issue certificates for intranet hosts to everyone. Therefore, we
- // always treat intranet hosts as having run insecure content.
+ // CAs issue certificate for intranet hosts to everyone. Therefore, we always
+ // treat intranet hosts as broken.
if (IsIntranetHost(host))
return true;
- return !!ran_insecure_content_hosts_.count(BrokenHostEntry(host, pid));
+ return (broken_hosts_.find(
+ BrokenHostEntry(host, pid)) != broken_hosts_.end());
}
void SSLHostState::DenyCertForHost(net::X509Certificate* cert,
« no previous file with comments | « chrome/browser/ssl/ssl_host_state.h ('k') | chrome/browser/ssl/ssl_host_state_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698