2 files changed, 17 insertions, 17 deletions

diff --git a/chrome/browser/tab_contents/navigation_entry.h b/chrome/browser/tab_contents/navigation_entry.h
index 833107c..1faee15 100644
--- a/chrome/browser/tab_contents/navigation_entry.h
+++ b/chrome/browser/tab_contents/navigation_entry.h
@@ -38,16 +38,16 @@ class NavigationEntry {
     // Flags used for the page security content status.
     enum ContentStatusFlags {
       // HTTP page, or HTTPS page with no insecure content.
-      NORMAL_CONTENT          = 0,
+      NORMAL_CONTENT             = 0,
 
       // HTTPS page containing "displayed" HTTP resources (e.g. images, CSS).
-      DISPLAYED_MIXED_CONTENT = 1 << 0,
+      DISPLAYED_INSECURE_CONTENT = 1 << 0,
 
       // HTTPS page containing "executed" HTTP resources (i.e. script).
       // Also currently used for HTTPS page containing broken-HTTPS resources;
       // this is wrong and should be fixed (see comments in
       // SSLPolicy::OnRequestStarted()).
-      RAN_MIXED_CONTENT       = 1 << 1,
+      RAN_INSECURE_CONTENT       = 1 << 1,
     };
 
     SSLStatus();
@@ -88,18 +88,18 @@ class NavigationEntry {
       return security_bits_;
     }
 
-    void set_displayed_mixed_content() {
-      content_status_ |= DISPLAYED_MIXED_CONTENT;
+    void set_displayed_insecure_content() {
+      content_status_ |= DISPLAYED_INSECURE_CONTENT;
     }
-    bool displayed_mixed_content() const {
-      return (content_status_ & DISPLAYED_MIXED_CONTENT) != 0;
+    bool displayed_insecure_content() const {
+      return (content_status_ & DISPLAYED_INSECURE_CONTENT) != 0;
     }
 
-    void set_ran_mixed_content() {
-      content_status_ |= RAN_MIXED_CONTENT;
+    void set_ran_insecure_content() {
+      content_status_ |= RAN_INSECURE_CONTENT;
     }
-    bool ran_mixed_content() const {
-      return (content_status_ & RAN_MIXED_CONTENT) != 0;
+    bool ran_insecure_content() const {
+      return (content_status_ & RAN_INSECURE_CONTENT) != 0;
     }
 
     // Raw accessors for all the content status flags. This contains a
diff --git a/chrome/browser/tab_contents/navigation_entry_unittest.cc b/chrome/browser/tab_contents/navigation_entry_unittest.cc
index ef37b11..d742d3e 100644
--- a/chrome/browser/tab_contents/navigation_entry_unittest.cc
+++ b/chrome/browser/tab_contents/navigation_entry_unittest.cc
@@ -101,27 +101,27 @@ TEST_F(NavigationEntryTest, NavigationEntrySSLStatus) {
   EXPECT_EQ(0, entry1_.get()->ssl().cert_id());
   EXPECT_EQ(0, entry1_.get()->ssl().cert_status());
   EXPECT_EQ(-1, entry1_.get()->ssl().security_bits());
-  EXPECT_FALSE(entry1_.get()->ssl().displayed_mixed_content());
-  EXPECT_FALSE(entry1_.get()->ssl().ran_mixed_content());
+  EXPECT_FALSE(entry1_.get()->ssl().displayed_insecure_content());
+  EXPECT_FALSE(entry1_.get()->ssl().ran_insecure_content());
 
   // Change from the defaults
   entry2_.get()->ssl().set_security_style(SECURITY_STYLE_AUTHENTICATED);
   entry2_.get()->ssl().set_cert_id(4);
   entry2_.get()->ssl().set_cert_status(1);
   entry2_.get()->ssl().set_security_bits(0);
-  entry2_.get()->ssl().set_displayed_mixed_content();
+  entry2_.get()->ssl().set_displayed_insecure_content();
   EXPECT_EQ(SECURITY_STYLE_AUTHENTICATED,
             entry2_.get()->ssl().security_style());
   EXPECT_EQ(4, entry2_.get()->ssl().cert_id());
   EXPECT_EQ(1, entry2_.get()->ssl().cert_status());
   EXPECT_EQ(0, entry2_.get()->ssl().security_bits());
-  EXPECT_TRUE(entry2_.get()->ssl().displayed_mixed_content());
+  EXPECT_TRUE(entry2_.get()->ssl().displayed_insecure_content());
 
   entry2_.get()->ssl().set_security_style(SECURITY_STYLE_AUTHENTICATION_BROKEN);
-  entry2_.get()->ssl().set_ran_mixed_content();
+  entry2_.get()->ssl().set_ran_insecure_content();
   EXPECT_EQ(SECURITY_STYLE_AUTHENTICATION_BROKEN,
             entry2_.get()->ssl().security_style());
-  EXPECT_TRUE(entry2_.get()->ssl().ran_mixed_content());
+  EXPECT_TRUE(entry2_.get()->ssl().ran_insecure_content());
 }
 
 // Test other basic accessors