Create a NavigationEntry for the initial blank page.

chrome/browser/ssl/ssl_browser_tests.cc

Index: chrome/browser/ssl/ssl_browser_tests.cc
diff --git a/chrome/browser/ssl/ssl_browser_tests.cc b/chrome/browser/ssl/ssl_browser_tests.cc
index 6d50c0b8c6ad91cf02664afd086581b5cd3e6d11..7141f53bb9733002aac2381cc8583cb0382b46fd 100644
--- a/chrome/browser/ssl/ssl_browser_tests.cc
+++ b/chrome/browser/ssl/ssl_browser_tests.cc
@@ -1193,17 +1193,18 @@ IN_PROC_BROWSER_TEST_F(SSLUITestWithClientCert, TestWSSClientCert) {
 
 // Flaky on CrOS http://crbug.com/92292
 #if defined(OS_CHROMEOS)
-#define MAYBE_TestHTTPSErrorWithNoNavEntry \
-    DISABLED_TestHTTPSErrorWithNoNavEntry
+#define MAYBE_TestHTTPSErrorOnInitialNavigation \
+    DISABLED_TestHTTPSErrorOnInitialNavigation
 #else
-#define MAYBE_TestHTTPSErrorWithNoNavEntry TestHTTPSErrorWithNoNavEntry
+#define MAYBE_TestHTTPSErrorOnInitialNavigation \
+    TestHTTPSErrorOnInitialNavigation
 #endif  // defined(OS_CHROMEOS)
 
 // Open a page with a HTTPS error in a tab with no prior navigation (through a
-// link with a blank target).  This is to test that the lack of navigation entry
-// does not cause any problems (it was causing a crasher, see
-// http://crbug.com/19941).
-IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSErrorWithNoNavEntry) {
+// link with a blank target).  This used to test for a case where we had no
+// NavigationEntry (for https://crbug.com/19941), but now it verifies the
+// behavior for the initial NavigationEntry.
+IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSErrorOnInitialNavigation) {
   ASSERT_TRUE(https_server_expired_.Start());
 
   GURL url = https_server_expired_.GetURL("files/ssl/google.htm");
@@ -1211,8 +1212,11 @@ IN_PROC_BROWSER_TEST_F(SSLUITest, MAYBE_TestHTTPSErrorWithNoNavEntry) {
       browser(), url, ui::PAGE_TRANSITION_TYPED);
   content::WaitForLoadStop(tab2);
 
-  // Verify our assumption that there was no prior navigation.
-  EXPECT_FALSE(chrome::CanGoBack(browser()));
+  // Verify our assumption that there was no prior navigation.  We can still go
+  // back to the initial (possibly modified) page, since the interstitial is
+  // just an overlay.
+  EXPECT_TRUE(tab2->GetController().IsInitialNavigation());
+  EXPECT_TRUE(chrome::CanGoBack(browser()));
 
   // We should have an interstitial page showing.
   ASSERT_TRUE(tab2->GetInterstitialPage());