diff options
| author | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-18 18:28:48 +0000 |
|---|---|---|
| committer | pkasting@chromium.org <pkasting@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-05-18 18:28:48 +0000 |
| commit | b4e75c12dacc0922694b12b687a48dd2d973b595 (patch) | |
| tree | 23d65e13ccf2fd9535ffb7ad965c5f2826efd6cc /chrome/browser/tab_contents/navigation_entry_unittest.cc | |
| parent | 15ad5dcb44ab2049103f738625e4e5f2483d85da (diff) | |
| download | chromium_src-b4e75c12dacc0922694b12b687a48dd2d973b595.zip chromium_src-b4e75c12dacc0922694b12b687a48dd2d973b595.tar.gz chromium_src-b4e75c12dacc0922694b12b687a48dd2d973b595.tar.bz2 | |
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
Diffstat (limited to 'chrome/browser/tab_contents/navigation_entry_unittest.cc')
| -rw-r--r-- | chrome/browser/tab_contents/navigation_entry_unittest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
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 |