Add an error page for HTTP 404 error pages without bodies.

chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc

Index: chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc
diff --git a/chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc b/chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc
index 1a4cb85299b810d8f9662c2882035bc24dac8541..4e9e163b3cb220f90ec38e64b588229a8ae61440 100644
--- a/chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc
+++ b/chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc
@@ -346,7 +346,7 @@ IN_PROC_BROWSER_TEST_F(ChromeSecurityStateModelClientTest, MixedContent) {
   ASSERT_TRUE(https_server_.Start());
   SetUpMockCertVerifierForHttpsServer(0, net::OK);
   host_resolver()->AddRule("example.test",
-                           https_server_.GetURL("/").host());
+                           https_server_.GetURL("/title1.html").host());
 
   net::HostPortPair replacement_pair = embedded_test_server()->host_port_pair();
   replacement_pair.set_host("example.test");
@@ -415,12 +415,13 @@ IN_PROC_BROWSER_TEST_F(ChromeSecurityStateModelClientTest, MixedContent) {
 
   // Navigate to an HTTPS page that runs mixed content in an iframe.
   net::HostPortPair host_port_pair =
-      net::HostPortPair::FromURL(https_server_.GetURL("/"));
+      net::HostPortPair::FromURL(https_server_.GetURL("/title1.html"));
   host_port_pair.set_host("different-host.test");
   host_resolver()->AddRule("different-host.test",
-                           https_server_.GetURL("/").host());
-  host_resolver()->AddRule("different-http-host.test",
-                           embedded_test_server()->GetURL("/").host());
+                           https_server_.GetURL("/title1.html").host());
+  host_resolver()->AddRule(
+      "different-http-host.test",
+      embedded_test_server()->GetURL("/title1.html").host());
   GetFilePathWithHostAndPortReplacement(
       "/ssl/page_runs_insecure_content_in_iframe.html", host_port_pair,
       &replacement_path);
@@ -446,7 +447,7 @@ IN_PROC_BROWSER_TEST_F(ChromeSecurityStateModelClientTest,
                                       net::OK);
 
   host_resolver()->AddRule("example.test",
-                           https_server_.GetURL("/").host());
+                           https_server_.GetURL("/title1.html").host());
 
   net::HostPortPair replacement_pair = embedded_test_server()->host_port_pair();
   replacement_pair.set_host("example.test");
@@ -528,10 +529,10 @@ IN_PROC_BROWSER_TEST_F(ChromeSecurityStateModelClientTest,
   // iframe, with strict mixed content blocking.
   std::string replacement_path;
   net::HostPortPair host_port_pair =
-      net::HostPortPair::FromURL(https_server_.GetURL("/"));
+      net::HostPortPair::FromURL(https_server_.GetURL("/title1.html"));
   host_port_pair.set_host("different-host.test");
   host_resolver()->AddRule("different-host.test",
-                           https_server_.GetURL("/").host());
+                           https_server_.GetURL("/title1.html").host());
   GetFilePathWithHostAndPortReplacement(
       "/ssl/page_runs_insecure_content_in_iframe_with_strict_blocking.html",
       host_port_pair, &replacement_path);
@@ -709,7 +710,7 @@ class SecurityStateModelLoadingTest
     content::BrowserThread::PostTask(
         content::BrowserThread::IO, FROM_HERE,
         base::Bind(&InstallLoadingInterceptor,
-                   embedded_test_server()->GetURL("/").host()));
+                   embedded_test_server()->GetURL("/title1.html").host()));

[estark, 2016/08/02 15:56:27]

None of the changes above here appear to be necessary, as they all just grab the
host and ignore the path. I have no problem if you want to keep it as is just
for consistency, but just making a note of it.

[mmenke, 2016/08/02 16:27:00]

Two tests in this file fail without the change, not sure if all of them do. 
Maybe showing an error page removes the secure connection information?

Sample failure:

../../chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc:854:
Failure
Value of: observer.latest_security_style()
  Actual: 1
Expected: content::SECURITY_STYLE_AUTHENTICATED
Which is: 4
../../chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc:142:
Failure
Value of: secure_explanations.size()
  Actual: 1
Expected: cert_status == VALID_CERTIFICATE ? 2u : 1u
Which is: 2
[30450:30565:0729/130753:WARNING:embedded_test_server.cc(202)] Request not
handled. Returning 404: /
[30512:30522:0729/130753:ERROR:node_controller.cc(1099)] Could not be introduced
to peer 386E624A087FAB90.1FB5EFE2A9AF3BAA
../../chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc:107:
Failure
Value of: observer.latest_security_style()
  Actual: 1
Expected: content::SECURITY_STYLE_AUTHENTICATION_BROKEN
Which is: 2
../../chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc:112:
Failure
Value of: expired_explanation.broken_explanations.size()
  Actual: 0
Expected: 1u
Which is: 1
../../chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc:159:
Failure
Value of: secure_explanations.back().summary
  Actual: "Valid Certificate"
Expected: l10n_util::GetStringUTF8(18966)
Which is: "Secure TLS connection"
../../chrome/browser/ssl/chrome_security_state_model_client_browser_tests.cc:162:
Failure
Value of: secure_explanations.back().description
  Actual: "The connection to this site is using a valid, trusted server
certificate."
Expected: l10n_util::GetStringUTF8(18967)

   }
 
   DISALLOW_COPY_AND_ASSIGN(SecurityStateModelLoadingTest);
@@ -732,9 +733,9 @@ IN_PROC_BROWSER_TEST_F(SecurityStateModelLoadingTest, NavigationStateChanges) {
 
   // Navigate to a page that doesn't finish loading. Test that the
   // security state is neutral while the page is loading.
-  browser()->OpenURL(content::OpenURLParams(embedded_test_server()->GetURL("/"),
-                                            content::Referrer(), CURRENT_TAB,
-                                            ui::PAGE_TRANSITION_TYPED, false));
+  browser()->OpenURL(content::OpenURLParams(
+      embedded_test_server()->GetURL("/title1.html"), content::Referrer(),
+      CURRENT_TAB, ui::PAGE_TRANSITION_TYPED, false));
   CheckSecurityInfoForNonSecure(
       browser()->tab_strip_model()->GetActiveWebContents());
 }
@@ -754,7 +755,7 @@ IN_PROC_BROWSER_TEST_F(ChromeSecurityStateModelClientTest, AddedTab) {
   content::NavigationController& controller = new_contents->GetController();
   ChromeSecurityStateModelClient::CreateForWebContents(new_contents);
   CheckSecurityInfoForNonSecure(new_contents);
-  controller.LoadURL(https_server_.GetURL("/"), content::Referrer(),
+  controller.LoadURL(https_server_.GetURL("/title1.html"), content::Referrer(),
                      ui::PAGE_TRANSITION_TYPED, std::string());
   EXPECT_TRUE(content::WaitForLoadStop(new_contents));
   CheckSecurityInfoForSecure(new_contents, SecurityStateModel::SECURE,
@@ -788,7 +789,7 @@ IN_PROC_BROWSER_TEST_F(SecurityStyleChangedTest, SecurityStyleChangedObserver) {
   SecurityStyleTestObserver observer(web_contents);
 
   // Visit an HTTP url.
-  GURL http_url(embedded_test_server()->GetURL("/"));
+  GURL http_url(embedded_test_server()->GetURL("/title1.html"));
   ui_test_utils::NavigateToURL(browser(), http_url);
   EXPECT_EQ(content::SECURITY_STYLE_UNAUTHENTICATED,
             observer.latest_security_style());
@@ -830,7 +831,7 @@ IN_PROC_BROWSER_TEST_F(SecurityStyleChangedTest, SecurityStyleChangedObserver) {
             mixed_content_explanation.ran_insecure_content_style);
 
   // Visit a broken HTTPS url.
-  GURL expired_url(https_test_server_expired.GetURL(std::string("/")));
+  GURL expired_url(https_test_server_expired.GetURL("/title1.html"));
   ui_test_utils::NavigateToURL(browser(), expired_url);
 
   // An interstitial should show, and an event for the lock icon on the
@@ -848,7 +849,7 @@ IN_PROC_BROWSER_TEST_F(SecurityStyleChangedTest, SecurityStyleChangedObserver) {
 
   // Before clicking through, navigate to a different page, and then go
   // back to the interstitial.
-  GURL valid_https_url(https_server_.GetURL(std::string("/")));
+  GURL valid_https_url(https_server_.GetURL("/title1.html"));
   ui_test_utils::NavigateToURL(browser(), valid_https_url);
   EXPECT_EQ(content::SECURITY_STYLE_AUTHENTICATED,
             observer.latest_security_style());
@@ -914,7 +915,7 @@ IN_PROC_BROWSER_TEST_F(SecurityStyleChangedTest,
   SecurityStyleTestObserver observer(web_contents);
 
   // Visit a valid HTTPS url.
-  GURL valid_https_url(https_server_.GetURL(std::string("/")));
+  GURL valid_https_url(https_server_.GetURL("/title1.html"));
   ui_test_utils::NavigateToURL(browser(), valid_https_url);
   EXPECT_EQ(content::SECURITY_STYLE_AUTHENTICATED,
             observer.latest_security_style());
@@ -931,7 +932,7 @@ IN_PROC_BROWSER_TEST_F(SecurityStyleChangedTest,
 
   // Navigate to a bad HTTPS page on a different host, and then click
   // Back to verify that the previous good security style is seen again.
-  GURL expired_https_url(https_test_server_expired.GetURL(std::string("/")));
+  GURL expired_https_url(https_test_server_expired.GetURL("/title1.html"));
   host_resolver()->AddRule("www.example_broken.test", "127.0.0.1");
   GURL::Replacements replace_host;
   replace_host.SetHostStr("www.example_broken.test");