Rename "mixed content" to "insecure content" in as many places as possible, to standardize on a consistent naming scheme.

BUG=none
TEST=none
Review URL: http://codereview.chromium.org/2069005

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@47531 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 5 insertions, 11 deletions

diff --git a/chrome/browser/ssl/ssl_manager.cc b/chrome/browser/ssl/ssl_manager.cc
index 99729b6..333d8b2 100644
--- a/chrome/browser/ssl/ssl_manager.cc
+++ b/chrome/browser/ssl/ssl_manager.cc
@@ -23,12 +23,6 @@
 #include "net/base/cert_status_flags.h"
 
 // static
-void SSLManager::RegisterUserPrefs(PrefService* prefs) {
-  prefs->RegisterIntegerPref(prefs::kMixedContentFiltering,
-                             FilterPolicy::DONT_FILTER);
-}
-
-// static
 void SSLManager::OnSSLCertificateError(ResourceDispatcherHost* rdh,
                                        URLRequest* request,
                                        int cert_error,
@@ -256,11 +250,11 @@ void SSLManager::DidStartResourceResponse(ResourceRequestDetails* details) {
 }
 
 void SSLManager::DidReceiveResourceRedirect(ResourceRedirectDetails* details) {
-  // TODO(abarth): Make sure our redirect behavior is correct.  If we ever see
-  //               a non-HTTPS resource in the redirect chain, we want to
-  //               trigger mixed content, even if the redirect chain goes back
-  //               to HTTPS.  This is because the network attacker can redirect
-  //               the HTTP request to https://attacker.com/payload.js.
+  // TODO(abarth): Make sure our redirect behavior is correct.  If we ever see a
+  //               non-HTTPS resource in the redirect chain, we want to trigger
+  //               insecure content, even if the redirect chain goes back to
+  //               HTTPS.  This is because the network attacker can redirect the
+  //               HTTP request to https://attacker.com/payload.js.
 }
 
 void SSLManager::DidChangeSSLInternalState() {