Pass explicitly the frame to HistoryController::GoToEntry

content/renderer/history_controller.cc

Index: content/renderer/history_controller.cc
diff --git a/content/renderer/history_controller.cc b/content/renderer/history_controller.cc
index 0eb220b57322c61fffc2573cb275ac2291b562d9..c695efb4a5c497c91ef6367e7fe7a56d5b3250f0 100644
--- a/content/renderer/history_controller.cc
+++ b/content/renderer/history_controller.cc
@@ -56,16 +56,17 @@ HistoryController::~HistoryController() {
 }
 
 void HistoryController::GoToEntry(
+    blink::WebLocalFrame* main_frame,
     scoped_ptr<HistoryEntry> target_entry,
     scoped_ptr<NavigationParams> navigation_params,
     WebURLRequest::CachePolicy cache_policy) {
+  DCHECK(!main_frame->parent());
   HistoryFrameLoadVector same_document_loads;
   HistoryFrameLoadVector different_document_loads;
 
   set_provisional_entry(target_entry.Pass());
   navigation_params_ = navigation_params.Pass();
 
-  WebFrame* main_frame = render_view_->GetMainRenderFrame()->GetWebFrame();
   if (current_entry_) {
     RecursiveGoToEntry(
         main_frame, same_document_loads, different_document_loads);