Avoid corrupting the pending_entry when an unexpected navigation commits.

chrome/browser/safe_browsing/safe_browsing_blocking_page_unittest.cc

 // Copyright (c) 2010 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 "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/safe_browsing/malware_details.h"
 #include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h"
 #include "chrome/common/pref_names.h"
@@ skipping 87 matching lines @@
     else
       user_response_ = CANCEL;
   }
 
   void Navigate(const char* url, int page_id) {
     ViewHostMsg_FrameNavigate_Params params;
     InitNavigateParams(&params, page_id, GURL(url), PageTransition::TYPED);
     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,
                         const char* url) {
     SafeBrowsingService::UnsafeResource resource;
     InitResource(&resource, resource_type, GURL(url));
     SafeBrowsingBlockingPage::ShowBlockingPage(service_, resource);
   }
 
   // Returns the SafeBrowsingBlockingPage currently showing or NULL if none is
@@ skipping 327 matching lines @@
 
   // Now navigate to a bad page triggerring an interstitial.
   controller().LoadURL(GURL(kBadURL), GURL(), PageTransition::TYPED);
   ShowInterstitial(ResourceType::MAIN_FRAME, kBadURL);
   SafeBrowsingBlockingPage* sb_interstitial = GetSafeBrowsingBlockingPage();
   ASSERT_TRUE(sb_interstitial);
 
   // 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();
   ASSERT_FALSE(sb_interstitial);
   ASSERT_EQ(2, controller().entry_count());
   EXPECT_EQ(kGoodURL, controller().GetActiveEntry()->url().spec());
 
   // Navigate forward to the malware URL.
   contents()->controller().GoForward();
   ShowInterstitial(ResourceType::MAIN_FRAME, kBadURL);
@@ skipping 102 matching lines @@
 
   EXPECT_TRUE(contents()->profile()->GetPrefs()->GetBoolean(
       prefs::kSafeBrowsingReportingEnabled));
 
   // Simulate the user uncheck the report agreement checkbox.
   sb_interstitial->SetReportingPreference(false);
 
   EXPECT_FALSE(contents()->profile()->GetPrefs()->GetBoolean(
       prefs::kSafeBrowsingReportingEnabled));
 }