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

4 files changed, 7 insertions, 13 deletions

diff --git a/chrome/common/filter_policy.h b/chrome/common/filter_policy.h
index 51ba1e4..7bf17d2 100644
--- a/chrome/common/filter_policy.h
+++ b/chrome/common/filter_policy.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2006-2008 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.
 
@@ -7,10 +7,10 @@
 
 #include "base/basictypes.h"
 
-// When an insecure resource (mixed content or bad HTTPS) is loaded, the browser
-// can decide to filter it.  The filtering is done in the renderer.  This class
-// enumerates the different policy that can be used for the filtering.  It is
-// passed along with resource response messages.
+// When an insecure resource (insecure content or bad HTTPS) is loaded, the
+// browser can decide to filter it.  The filtering is done in the renderer.
+// This class enumerates the different policy that can be used for the
+// filtering.  It is passed along with resource response messages.
 // It can be used for content post-processing, like message replacement within
 // extension css files.
 class FilterPolicy {
diff --git a/chrome/common/pref_names.cc b/chrome/common/pref_names.cc
index b7dc105..9ac99fd 100644
--- a/chrome/common/pref_names.cc
+++ b/chrome/common/pref_names.cc
@@ -124,11 +124,6 @@ const wchar_t kSearchSuggestEnabled[] = L"search.suggest_enabled";
 // 2 - block all cookies
 const wchar_t kCookieBehavior[] = L"security.cookie_behavior";
 
-// Boolean that is true if mixed content should be filtered.
-// TODO(jcampan): http://b/1084034: at some point this will become an enum
-//                 (int): don't filter, filter everything, filter images only.
-const wchar_t kMixedContentFiltering[] = L"security.mixed_content_filtering";
-
 // The URL (as understood by TemplateURLRef) the default search provider uses
 // for searches.
 const wchar_t kDefaultSearchProviderSearchURL[] =
diff --git a/chrome/common/pref_names.h b/chrome/common/pref_names.h
index ce72ef7..360c9f4 100644
--- a/chrome/common/pref_names.h
+++ b/chrome/common/pref_names.h
@@ -49,7 +49,6 @@ extern const wchar_t kFormAutofillEnabled[];  // OBSOLETE
 extern const wchar_t kSafeBrowsingEnabled[];
 extern const wchar_t kSearchSuggestEnabled[];
 extern const wchar_t kCookieBehavior[];  // OBSOLETE
-extern const wchar_t kMixedContentFiltering[];
 extern const wchar_t kDefaultSearchProviderSearchURL[];
 extern const wchar_t kDefaultSearchProviderSuggestURL[];
 extern const wchar_t kDefaultSearchProviderName[];
diff --git a/chrome/common/render_messages.h b/chrome/common/render_messages.h
index ca7659d..1b546e2 100644
--- a/chrome/common/render_messages.h
+++ b/chrome/common/render_messages.h
@@ -323,11 +323,11 @@ struct ViewHostMsg_Resource_Request {
   GURL referrer;
 
   // The origin of the frame that is associated with this request.  This is used
-  // to update our mixed content state.
+  // to update our insecure content state.
   std::string frame_origin;
 
   // The origin of the main frame (top-level frame) that is associated with this
-  // request.  This is used to update our mixed content state.
+  // request.  This is used to update our insecure content state.
   std::string main_frame_origin;
 
   // Additional HTTP request headers.