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, 15 insertions, 15 deletions

diff --git a/chrome/test/automation/automation_messages.h b/chrome/test/automation/automation_messages.h
index d2fff4b..307fab1 100644
--- a/chrome/test/automation/automation_messages.h
+++ b/chrome/test/automation/automation_messages.h
@@ -452,8 +452,8 @@ struct NavigationInfo {
   std::wstring title;
   GURL url;
   SecurityStyle security_style;
-  bool displayed_mixed_content;
-  bool ran_mixed_content;
+  bool displayed_insecure_content;
+  bool ran_insecure_content;
 };
 
 // Traits for NavigationInfo structure to pack/unpack.
@@ -467,8 +467,8 @@ struct ParamTraits<NavigationInfo> {
     WriteParam(m, p.title);
     WriteParam(m, p.url);
     WriteParam(m, p.security_style);
-    WriteParam(m, p.displayed_mixed_content);
-    WriteParam(m, p.ran_mixed_content);
+    WriteParam(m, p.displayed_insecure_content);
+    WriteParam(m, p.ran_insecure_content);
   }
   static bool Read(const Message* m, void** iter, param_type* p) {
     return ReadParam(m, iter, &p->navigation_type) &&
@@ -477,8 +477,8 @@ struct ParamTraits<NavigationInfo> {
            ReadParam(m, iter, &p->title) &&
            ReadParam(m, iter, &p->url) &&
            ReadParam(m, iter, &p->security_style) &&
-           ReadParam(m, iter, &p->displayed_mixed_content) &&
-           ReadParam(m, iter, &p->ran_mixed_content);
+           ReadParam(m, iter, &p->displayed_insecure_content) &&
+           ReadParam(m, iter, &p->ran_insecure_content);
   }
   static void Log(const param_type& p, std::wstring* l) {
     l->append(L"(");
@@ -494,9 +494,9 @@ struct ParamTraits<NavigationInfo> {
     l->append(L", ");
     LogParam(p.security_style, l);
     l->append(L", ");
-    LogParam(p.displayed_mixed_content, l);
+    LogParam(p.displayed_insecure_content, l);
     l->append(L", ");
-    LogParam(p.ran_mixed_content, l);
+    LogParam(p.ran_insecure_content, l);
     l->append(L")");
   }
 };
diff --git a/chrome/test/automation/automation_messages_internal.h b/chrome/test/automation/automation_messages_internal.h
index 77f9d56..ee725c8 100644
--- a/chrome/test/automation/automation_messages_internal.h
+++ b/chrome/test/automation/automation_messages_internal.h
@@ -596,7 +596,7 @@ IPC_BEGIN_MESSAGES(Automation)
   //  - SecurityStyle: the security style of the tab.
   //  - int: the status of the server's ssl cert (0 means no errors or no ssl
   //         was used).
-  //  - int: the mixed content state, 0 means no mixed/unsafe contents.
+  //  - int: the insecure content state, 0 means no insecure contents.
 
   IPC_SYNC_MESSAGE_ROUTED1_4(AutomationMsg_GetSecurityState,
                              int,
diff --git a/chrome/test/automation/tab_proxy.cc b/chrome/test/automation/tab_proxy.cc
index 0c2c27f..8e31e00 100644
--- a/chrome/test/automation/tab_proxy.cc
+++ b/chrome/test/automation/tab_proxy.cc
@@ -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.
 
@@ -564,8 +564,8 @@ bool TabProxy::WaitForTabToBeRestored(uint32 timeout_ms) {
 
 bool TabProxy::GetSecurityState(SecurityStyle* security_style,
                                 int* ssl_cert_status,
-                                int* mixed_content_state) {
-  DCHECK(security_style && ssl_cert_status && mixed_content_state);
+                                int* insecure_content_status) {
+  DCHECK(security_style && ssl_cert_status && insecure_content_status);
 
   if (!is_valid())
     return false;
@@ -574,7 +574,7 @@ bool TabProxy::GetSecurityState(SecurityStyle* security_style,
 
   sender_->Send(new AutomationMsg_GetSecurityState(
       0, handle_, &succeeded, security_style, ssl_cert_status,
-      mixed_content_state));
+      insecure_content_status));
 
   return succeeded;
 }
diff --git a/chrome/test/automation/tab_proxy.h b/chrome/test/automation/tab_proxy.h
index 3929213..fbe2573 100644
--- a/chrome/test/automation/tab_proxy.h
+++ b/chrome/test/automation/tab_proxy.h
@@ -1,4 +1,4 @@
-// Copyright (c) 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.
 
@@ -306,7 +306,7 @@ class TabProxy : public AutomationResourceProxy,
   // Retrieves the different security states for the current tab.
   bool GetSecurityState(SecurityStyle* security_style,
                         int* ssl_cert_status,
-                        int* mixed_content_state) WARN_UNUSED_RESULT;
+                        int* insecure_content_status) WARN_UNUSED_RESULT;
 
   // Returns the type of the page currently showing (normal, interstitial,
   // error).