Index: content/shell/renderer/layout_test/blink_test_runner.cc |
diff --git a/content/shell/renderer/layout_test/blink_test_runner.cc b/content/shell/renderer/layout_test/blink_test_runner.cc |
index 2058533116f521116dba5d940b874f259d1c2b31..09c91b67a66ea057195c38a7fef7b219d18e50c6 100644 |
--- a/content/shell/renderer/layout_test/blink_test_runner.cc |
+++ b/content/shell/renderer/layout_test/blink_test_runner.cc |
@@ -1022,12 +1022,16 @@ void BlinkTestRunner::OnSessionHistory( |
} |
void BlinkTestRunner::OnReset() { |
+ // ShellViewMsg_Reset should always be sent to the *current* view. |
+ DCHECK(render_view()->GetWebView()->MainFrame()->IsWebLocalFrame()); |
+ WebLocalFrame* main_frame = |
+ render_view()->GetWebView()->MainFrame()->ToWebLocalFrame(); |
+ |
LayoutTestRenderThreadObserver::GetInstance()->test_interfaces()->ResetAll(); |
Reset(true /* for_new_test */); |
// Navigating to about:blank will make sure that no new loads are initiated |
// by the renderer. |
- WebURLRequest request = WebURLRequest(GURL(url::kAboutBlankURL)); |
- render_view()->GetWebView()->MainFrame()->LoadRequest(request); |
+ main_frame->LoadRequest(WebURLRequest(GURL(url::kAboutBlankURL))); |
Send(new ShellViewHostMsg_ResetDone(routing_id())); |
} |