Add separate plumbing for subresources with certificate errors

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 6392 matching lines @@
   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, but
   // they were redundant with the main resource, so the page should not
   // be marked as displaying insecure content.
   EXPECT_FALSE(entry->GetSSL().content_status &
-               SSLStatus::DISPLAYED_INSECURE_CONTENT);
+               SSLStatus::DISPLAYED_CONTENT_WITH_CERTIFICATE_ERRORS);
 }
 
 // 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.
 IN_PROC_BROWSER_TEST_F(SitePerProcessIgnoreCertErrorsBrowserTest,
                        SubresourceWithNonRedundantCertificateErrors) {
@@ skipping 13 matching lines @@
 
   // 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.
   EXPECT_TRUE(entry->GetSSL().content_status &
-              SSLStatus::DISPLAYED_INSECURE_CONTENT);
+              SSLStatus::DISPLAYED_CONTENT_WITH_CERTIFICATE_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 1036 matching lines @@
 
   shell()->web_contents()->WasShown();
 
   EXPECT_TRUE(ExecuteScriptAndExtractInt(
       root->child_at(0)->current_frame_host(),
       "window.domAutomationController.send(event_fired);", &event_fired));
   EXPECT_EQ(2, event_fired);
 }
 
 }  // namespace content