Create a NavigationEntry for the initial blank page.

chrome/browser/ssl/ssl_browser_tests.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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/metrics/field_trial.h"
@@ skipping 1175 matching lines @@
 
   // Test page runs a WebSocket wss connection test. The result will be shown
   // as page title.
   const base::string16 result = watcher.WaitAndGetTitle();
   EXPECT_TRUE(base::LowerCaseEqualsASCII(result, "pass"));
 }
 #endif  // defined(USE_NSS_CERTS)
 
 // 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");
   WebContents* tab2 = chrome::AddSelectedTabWithURL(
       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());
   ASSERT_EQ(SSLBlockingPage::kTypeForTesting, tab2->GetInterstitialPage()
                                                   ->GetDelegateForTesting()
                                                   ->GetTypeForTesting());
 }
 
 IN_PROC_BROWSER_TEST_F(SSLUITest, TestBadHTTPSDownload) {
   ASSERT_TRUE(test_server()->Start());
@@ skipping 1681 matching lines @@
 
 // Visit a page over https that contains a frame with a redirect.
 
 // XMLHttpRequest insecure content in synchronous mode.
 
 // XMLHttpRequest insecure content in asynchronous mode.
 
 // XMLHttpRequest over bad ssl in synchronous mode.
 
 // XMLHttpRequest over OK ssl in synchronous mode.