Track subresources with cert errors separately from mixed content

content/browser/site_per_process_browsertest.cc

 // Copyright (c) 2012 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.
 
 #include "content/browser/site_per_process_browsertest.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 6364 matching lines @@
   FrameTreeNode* root = web_contents()->GetFrameTree()->root();
   ASSERT_EQ(1U, root->child_count());
   FrameTreeNode* mixed_child = root->child_at(0)->child_at(0);
   ASSERT_TRUE(mixed_child);
   // The child iframe attempted to create a mixed iframe; this should
   // have been blocked, so the mixed iframe should not have committed a
   // load.
   EXPECT_FALSE(mixed_child->has_committed_real_load());
 }
 
-// Test that subresources with certificate errors that are NOT redundant
-// with the main page DO get reported to the browser. That is, if
-// https://nonredundant.test frames https://a.com which loads an image
-// with certificate errors, the browser should be notified about the
-// subresource with certificate errors and downgrade the UI
-// appropriately.
+// Test that subresources with certificate errors get reported to the
+// browser. That is, if https://example.test frames https://a.com which
+// loads an image with certificate errors, the browser should be
+// notified about the subresource with certificate errors and downgrade
+// the UI appropriately.
 IN_PROC_BROWSER_TEST_F(SitePerProcessIgnoreCertErrorsBrowserTest,
-                       SubresourceWithNonRedundantCertificateErrors) {
+                       SubresourceWithCertificateErrors) {
   net::EmbeddedTestServer https_server(net::EmbeddedTestServer::TYPE_HTTPS);
   https_server.ServeFilesFromSourceDirectory("content/test/data");
   ASSERT_TRUE(https_server.Start());
   SetupCrossSiteRedirector(&https_server);
 
   GURL url(https_server.GetURL(
-      "nonredundant.test",
+      "example.test",
       "/mixed-content/non-redundant-cert-error-in-iframe.html"));
   EXPECT_TRUE(NavigateToURL(shell(), url));
 
   NavigationEntry* entry =
       shell()->web_contents()->GetController().GetLastCommittedEntry();
   ASSERT_TRUE(entry);
 
   // The main page was loaded with certificate errors.
   EXPECT_EQ(SECURITY_STYLE_AUTHENTICATION_BROKEN,
             entry->GetSSL().security_style);
 
-  // The image that the iframe loaded had certificate errors also, and
-  // they were different than the certificate errors of the main
-  // resource, so the page should be marked as having displayed insecure
-  // content.
+  // The image that the iframe loaded had certificate errors also, so
+  // the page should be marked as having displayed subresources with
+  // cert errors.
   EXPECT_TRUE(entry->GetSSL().content_status &
-              SSLStatus::DISPLAYED_INSECURE_CONTENT);
+              SSLStatus::DISPLAYED_CONTENT_WITH_CERT_ERRORS);
 }
 
 // Test setting a cross-origin iframe to display: none.
 IN_PROC_BROWSER_TEST_F(SitePerProcessBrowserTest, CrossSiteIframeDisplayNone) {
   GURL main_url(embedded_test_server()->GetURL(
       "a.com", "/cross_site_iframe_factory.html?a(b)"));
   NavigateToURL(shell(), main_url);
 
   FrameTreeNode* root = web_contents()->GetFrameTree()->root();
   RenderWidgetHost* root_render_widget_host =
@@ skipping 1215 matching lines @@
             root_frame_monitor.events_received()[5]);
   EXPECT_EQ(blink::WebInputEvent::GestureScrollEnd,
             root_frame_monitor.events_received()[6]);
 
   // Verify child-RWHI gets no events.
   EXPECT_FALSE(child_frame_monitor.EventWasReceived());
 }
 #endif
 
 }  // namespace content