Avoid corrupting the pending_entry when an unexpected navigation commits.

chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc

Index: chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
index 25a9a4368651484f0456f6794f76eab34e3df7c7..cd60ad8c1ed4dbe2dbc130f7550ac37d553a1a47 100644
--- a/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
+++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc
@@ -105,11 +105,16 @@ class SafeBrowsingBlockingPageTest : public RenderViewHostTestHarness,
     contents()->TestDidNavigate(contents_->render_view_host(), params);
   }
 
-  void GoBack() {
+  void GoBackCrossSite() {
     NavigationEntry* entry = contents()->controller().GetEntryAtOffset(-1);
     ASSERT_TRUE(entry);
     contents()->controller().GoBack();
-    Navigate(entry->url().spec().c_str(), entry->page_id());
+
+    // The navigation should commit in the pending RVH.
+    ViewHostMsg_FrameNavigate_Params params;
+    InitNavigateParams(&params, entry->page_id(), GURL(entry->url()),
+                       PageTransition::TYPED);
+    contents()->TestDidNavigate(contents_->pending_rvh(), params);
   }
 
   void ShowInterstitial(ResourceType::Type resource_type,
@@ -457,7 +462,7 @@ TEST_F(SafeBrowsingBlockingPageTest, NavigatingBackAndForth) {
   // Proceed, then navigate back.
   ProceedThroughInterstitial(sb_interstitial);
   Navigate(kBadURL, 2);  // Commit the navigation.
-  GoBack();
+  GoBackCrossSite();
 
   // We are back on the good page.
   sb_interstitial = GetSafeBrowsingBlockingPage();