Remove vestiges of has_unsafe_content(), which is no longer used.

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

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

5 files changed, 26 insertions, 56 deletions

diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index ef228ae..3cec4d0 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -5049,9 +5049,6 @@ Keep your key file in a safe place. You will need it to create new versions of y
       <message name="IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_MIXED_CONTENT_WARNING" desc="Some extra text of the connection section when the connection is encrypted and there is some mixed content on the page.">
         However, this page includes other resources which are not secure. These resources can be viewed by others while in transit, and can be modified by an attacker to change the look or behavior of the page.
       </message>
-      <message name="IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_BAD_HTTPS_WARNING" desc="Some extra text of the connection section when the connection is encrypted but there are some resources loaded over bad HTTPS on the page.">
-        However, this page includes resources from other websites whose identity cannot be verified.
-      </message>
       <message name="IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_SENTENCE_LINK" desc="Linking 2 sentences in 1 paragraph.">
         <ph name="SENTENCE1">$1<ex>Your connection is encrypted.</ex></ph> <ph name="SENTENCE2">$2<ex>However, this page includes resources from other pages whose identity cannot be verified.</ex></ph>
       </message>
diff --git a/chrome/browser/page_info_model.cc b/chrome/browser/page_info_model.cc
index f657273..890c3dfb 100644
--- a/chrome/browser/page_info_model.cc
+++ b/chrome/browser/page_info_model.cc
@@ -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.
 
@@ -146,14 +146,6 @@ PageInfoModel::PageInfoModel(Profile* profile,
               description,
               l10n_util::GetStringUTF16(
                   IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_MIXED_CONTENT_WARNING)));
-    } else if (ssl.has_unsafe_content()) {
-      state = false;
-      description.assign(
-          l10n_util::GetStringFUTF16(
-              IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_SENTENCE_LINK,
-              description,
-              l10n_util::GetStringUTF16(
-                  IDS_PAGE_INFO_SECURITY_TAB_ENCRYPTED_BAD_HTTPS_WARNING)));
     }
   }
   sections_.push_back(SectionInfo(
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index 22a585b..51c6e7b 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -34,15 +34,13 @@ class SSLUITest : public InProcessBrowserTest {
   }
 
   void CheckAuthenticatedState(TabContents* tab,
-                               bool mixed_content,
-                               bool unsafe_content) {
+                               bool mixed_content) {
     NavigationEntry* entry = tab->controller().GetActiveEntry();
     ASSERT_TRUE(entry);
     EXPECT_EQ(NavigationEntry::NORMAL_PAGE, entry->page_type());
     EXPECT_EQ(SECURITY_STYLE_AUTHENTICATED, entry->ssl().security_style());
     EXPECT_EQ(0, entry->ssl().cert_status() & net::CERT_STATUS_ALL_ERRORS);
     EXPECT_EQ(mixed_content, entry->ssl().has_mixed_content());
-    EXPECT_EQ(unsafe_content, entry->ssl().has_unsafe_content());
   }
 
   void CheckUnauthenticatedState(TabContents* tab) {
@@ -52,7 +50,6 @@ class SSLUITest : public InProcessBrowserTest {
     EXPECT_EQ(SECURITY_STYLE_UNAUTHENTICATED, entry->ssl().security_style());
     EXPECT_EQ(0, entry->ssl().cert_status() & net::CERT_STATUS_ALL_ERRORS);
     EXPECT_FALSE(entry->ssl().has_mixed_content());
-    EXPECT_FALSE(entry->ssl().has_unsafe_content());
   }
 
   void CheckAuthenticationBrokenState(TabContents* tab,
@@ -70,7 +67,6 @@ class SSLUITest : public InProcessBrowserTest {
     ASSERT_NE(net::CERT_STATUS_UNABLE_TO_CHECK_REVOCATION, error);
     EXPECT_EQ(error, entry->ssl().cert_status() & net::CERT_STATUS_ALL_ERRORS);
     EXPECT_FALSE(entry->ssl().has_mixed_content());
-    EXPECT_FALSE(entry->ssl().has_unsafe_content());
   }
 
   void CheckWorkerLoadResult(TabContents* tab, bool expectLoaded) {
@@ -152,8 +148,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestOKHTTPS) {
   ui_test_utils::NavigateToURL(browser(),
       https_server->TestServerPage("files/ssl/google.html"));
 
-  CheckAuthenticatedState(browser()->GetSelectedTabContents(),
-                          false, false);  // No mixed/unsafe content.
+  CheckAuthenticatedState(browser()->GetSelectedTabContents(), false);
 }
 
 // Visits a page with https error and proceed:
@@ -217,7 +212,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestHTTPSExpiredCertAndDontProceed) {
   interstitial_page->DontProceed();
 
   // We should be back to the original good page.
-  CheckAuthenticatedState(tab, false, false);
+  CheckAuthenticatedState(tab, false);
 
   // Try to navigate to a new page. (to make sure bug 5800 is fixed).
   ui_test_utils::NavigateToURL(browser(),
@@ -385,8 +380,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestMixedContents) {
   ui_test_utils::NavigateToURL(browser(), https_server->TestServerPage(
       "files/ssl/page_with_mixed_contents.html"));
 
-  CheckAuthenticatedState(browser()->GetSelectedTabContents(),
-                          true /* mixed-content */, false);
+  CheckAuthenticatedState(browser()->GetSelectedTabContents(), true);
 }
 
 // Visits a page with an http script that tries to suppress our mixed content
@@ -401,8 +395,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestMixedContentsRandomizeHash) {
   ui_test_utils::NavigateToURL(browser(), https_server->TestServerPage(
       "files/ssl/page_with_http_script.html"));
 
-  CheckAuthenticatedState(browser()->GetSelectedTabContents(),
-                          true /* mixed-content */, false);
+  CheckAuthenticatedState(browser()->GetSelectedTabContents(), true);
 }
 
 // Visits a page with unsafe content and make sure that:
@@ -421,7 +414,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestUnsafeContents) {
   TabContents* tab = browser()->GetSelectedTabContents();
   // When the bad content is filtered, the state is expected to be
   // authenticated.
-  CheckAuthenticatedState(tab, false, false);
+  CheckAuthenticatedState(tab, false);
 
   // Because of cross-frame scripting restrictions, we cannot access the iframe
   // content.  So to know if the frame was loaded, we just check if a popup was
@@ -457,7 +450,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestMixedContentsLoadedFromJS) {
       "files/ssl/page_with_dynamic_mixed_contents.html"));
 
   TabContents* tab = browser()->GetSelectedTabContents();
-  CheckAuthenticatedState(tab, false, false);
+  CheckAuthenticatedState(tab, false);
 
   // Load the insecure image.
   bool js_result = false;
@@ -466,7 +459,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestMixedContentsLoadedFromJS) {
   EXPECT_TRUE(js_result);
 
   // We should now have mixed-contents.
-  CheckAuthenticatedState(tab, true /* mixed-content */, false);
+  CheckAuthenticatedState(tab, true);
 }
 
 // Visits two pages from the same origin: one with mixed content and one
@@ -485,7 +478,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestMixedContentsTwoTabs) {
   TabContents* tab1 = browser()->GetSelectedTabContents();
 
   // This tab should be fine.
-  CheckAuthenticatedState(tab1, false, false);
+  CheckAuthenticatedState(tab1, false);
 
   // Create a new tab.
   GURL url =
@@ -496,11 +489,11 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestMixedContentsTwoTabs) {
   ui_test_utils::WaitForNavigation(&(tab2->controller()));
 
   // The new tab has mixed content.
-  CheckAuthenticatedState(tab2, true /* mixed-content */, false);
+  CheckAuthenticatedState(tab2, true);
 
   // Which means the origin for the first tab has also been contaminated with
   // mixed content.
-  CheckAuthenticatedState(tab1, true /* mixed-content */, false);
+  CheckAuthenticatedState(tab1, true);
 }
 
 // Visits a page with an image over http.  Visits another page over https
@@ -521,7 +514,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestCachedMixedContents) {
   // image comes from the WebCore memory cache).
   ui_test_utils::NavigateToURL(browser(), https_server->TestServerPage(
       "files/ssl/page_with_mixed_contents.html"));
-  CheckAuthenticatedState(tab, true /* mixed-content */, false);
+  CheckAuthenticatedState(tab, true);
 }
 
 // This test ensures the CN invalid status does not 'stick' to a certificate
@@ -561,7 +554,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestCNInvalidStickiness) {
   ui_test_utils::NavigateToURL(browser(), GURL(new_url));
 
   // Security state should be OK.
-  CheckAuthenticatedState(tab, false, false);
+  CheckAuthenticatedState(tab, false);
 
   // Now try again the broken one to make sure it is still broken.
   ui_test_utils::NavigateToURL(browser(),
@@ -656,7 +649,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestRedirectBadToGoodHTTPS) {
   ProceedThroughInterstitial(tab);
 
   // We have been redirected to the good page.
-  CheckAuthenticatedState(tab, false, false);  // No mixed/unsafe content.
+  CheckAuthenticatedState(tab, false);
 }
 
 // Visit a page over good https that is a redirect to a page with bad https.
@@ -697,7 +690,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, TestRedirectHTTPToGoodHTTPS) {
 
   ui_test_utils::NavigateToURL(browser(),
                                GURL(http_url.spec() + good_https_url.spec()));
-  CheckAuthenticatedState(tab, false, false);  // No mixed/unsafe content.
+  CheckAuthenticatedState(tab, false);
 }
 
 // Visit a page over http that is a redirect to a page with bad HTTPS.
@@ -773,7 +766,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestGoodFrameNavigation) {
       browser(),
       good_https_server->TestServerPage("files/ssl/top_frame.html"));
 
-  CheckAuthenticatedState(tab, false, false);
+  CheckAuthenticatedState(tab, false);
 
   bool success = false;
   // Now navigate inside the frame.
@@ -785,7 +778,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestGoodFrameNavigation) {
   ui_test_utils::WaitForNavigation(&tab->controller());
 
   // We should still be fine.
-  CheckAuthenticatedState(tab, false, false);
+  CheckAuthenticatedState(tab, false);
 
   // Now let's hit a bad page.
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
@@ -796,7 +789,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestGoodFrameNavigation) {
   ui_test_utils::WaitForNavigation(&tab->controller());
 
   // The security style should still be secure.
-  CheckAuthenticatedState(tab, false, false);
+  CheckAuthenticatedState(tab, false);
 
   // And the frame should be blocked.
   bool is_content_evil = true;
@@ -814,7 +807,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestGoodFrameNavigation) {
   // Now go back, our state should still be OK.
   tab->controller().GoBack();
   ui_test_utils::WaitForNavigation(&tab->controller());
-  CheckAuthenticatedState(tab, false, false);
+  CheckAuthenticatedState(tab, false);
 
   // Navigate to a page served over HTTP.
   EXPECT_TRUE(ui_test_utils::ExecuteJavaScriptAndExtractBool(
@@ -826,12 +819,12 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, DISABLED_TestGoodFrameNavigation) {
   ui_test_utils::WaitForNavigation(&tab->controller());
 
   // Our state should be mixed-content.
-  CheckAuthenticatedState(tab, true, false);
+  CheckAuthenticatedState(tab, true);
 
   // Go back, our state should be unchanged.
   tab->controller().GoBack();
   ui_test_utils::WaitForNavigation(&tab->controller());
-  CheckAuthenticatedState(tab, true, false);
+  CheckAuthenticatedState(tab, true);
 }
 
 // From a bad HTTPS top frame:
@@ -935,7 +928,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestUnsafeContentsInWorkerFiltered) {
   // Expect Worker not to load mixed content.
   CheckWorkerLoadResult(tab, false);
   // The bad content is filtered, expect the state to be authenticated.
-  CheckAuthenticatedState(tab, false, false);
+  CheckAuthenticatedState(tab, false);
 }
 
 // Marked as flaky, see bug 40932.
@@ -961,7 +954,7 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, FLAKY_TestUnsafeContentsInWorker) {
   ui_test_utils::NavigateToURL(browser(), good_https_server->TestServerPage(
       "files/ssl/page_with_unsafe_worker.html"));
   CheckWorkerLoadResult(tab, true);  // Worker loads mixed content
-  CheckAuthenticatedState(tab, true, false);  // Mixed content UI shown.
+  CheckAuthenticatedState(tab, true);
 }
 
 // TODO(jcampan): more tests to do below.
diff --git a/chrome/browser/tab_contents/navigation_entry.h b/chrome/browser/tab_contents/navigation_entry.h
index e679c10..503f1f1 100644
--- a/chrome/browser/tab_contents/navigation_entry.h
+++ b/chrome/browser/tab_contents/navigation_entry.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.
 
@@ -89,15 +89,6 @@ class NavigationEntry {
       return (content_status_ & MIXED_CONTENT) != 0;
     }
 
-    // Unsafe content means that this page is served over https but contains
-    // https sub-resources with cert errors.
-    void set_has_unsafe_content() {
-      content_status_ |= UNSAFE_CONTENT;
-    }
-    bool has_unsafe_content() const {
-      return (content_status_ & UNSAFE_CONTENT) != 0;
-    }
-
     // Raw accessors for all the content status flags. This contains a
     // combination of any of the ContentStatusFlags defined above. It is used
     // by some tests for checking and for certain copying. Use the per-status
diff --git a/chrome/browser/tab_contents/navigation_entry_unittest.cc b/chrome/browser/tab_contents/navigation_entry_unittest.cc
index 4461cd5..8fde535 100644
--- a/chrome/browser/tab_contents/navigation_entry_unittest.cc
+++ b/chrome/browser/tab_contents/navigation_entry_unittest.cc
@@ -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.
 
@@ -102,20 +102,17 @@ TEST_F(NavigationEntryTest, NavigationEntrySSLStatus) {
   EXPECT_EQ(0, entry1_.get()->ssl().cert_status());
   EXPECT_EQ(-1, entry1_.get()->ssl().security_bits());
   EXPECT_FALSE(entry1_.get()->ssl().has_mixed_content());
-  EXPECT_FALSE(entry1_.get()->ssl().has_unsafe_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_has_unsafe_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().has_unsafe_content());
 
   // Mixed content unaffected by unsafe content
   EXPECT_FALSE(entry2_.get()->ssl().has_mixed_content());