Track "display" and "run" separately for mixed content, and make the latter d...

chrome/browser/ssl/ssl_host_state.h

-// 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.
 
 #ifndef CHROME_BROWSER_SSL_SSL_HOST_STATE_H_
 #define CHROME_BROWSER_SSL_SSL_HOST_STATE_H_
 
 #include <string>
 #include <map>
 #include <set>
 
 #include "base/basictypes.h"
 #include "base/non_thread_safe.h"
 #include "googleurl/src/gurl.h"
 #include "net/base/x509_certificate.h"
 
 // SSLHostState
 //
 // The SSLHostState encapulates the host-specific state for SSL errors.  For
 // example, SSLHostState remembers whether the user has whitelisted a
 // particular broken cert for use with particular host.  We separate this state
 // from the SSLManager because this state is shared across many navigation
 // controllers.
 
 class SSLHostState : public NonThreadSafe {
  public:
   SSLHostState();
   ~SSLHostState();
 
-  // Records that a host is "broken" in a particular render process.  That is,
-  // the origin for that host has been contaminated with insecure content,
-  // either via HTTP or via HTTPS with a bad certificate.
-  void MarkHostAsBroken(const std::string& host, int pid);
+  // Records that a host has run insecure content.
+  void HostRanInsecureContent(const std::string& host, int pid);
 
-  // Returns whether the specified host was marked as broken in a particular
-  // render process.
-  bool DidMarkHostAsBroken(const std::string& host, int pid);
+  // Returns whether the specified host ran insecure content.
+  bool DidHostRunInsecureContent(const std::string& host, int pid) const;
 
   // Records that |cert| is permitted to be used for |host| in the future.
   void DenyCertForHost(net::X509Certificate* cert, const std::string& host);
 
   // Records that |cert| is not permitted to be used for |host| in the future.
   void AllowCertForHost(net::X509Certificate* cert, const std::string& host);
 
   // Queries whether |cert| is allowed or denied for |host|.
   net::X509Certificate::Policy::Judgment QueryPolicy(
       net::X509Certificate* cert, const std::string& host);
 
  private:
   // 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> broken_hosts_;
+  std::set<BrokenHostEntry> ran_insecure_content_hosts_;
 
   // Certificate policies for each host.
   std::map<std::string, net::X509Certificate::Policy> cert_policy_for_host_;
 
   DISALLOW_COPY_AND_ASSIGN(SSLHostState);
 };
 
 #endif  // CHROME_BROWSER_SSL_SSL_HOST_STATE_H_