Chromium Code Reviews| 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 cfcfcf215eb025e6f4a0dbe10fb993b1607d1a82..e52390606c8a6c4b7181b05ba9f891022b8f3e38 100644 |
| --- a/content/shell/renderer/layout_test/blink_test_runner.cc |
| +++ b/content/shell/renderer/layout_test/blink_test_runner.cc |
| @@ -841,7 +841,7 @@ void BlinkTestRunner::DidFailProvisionalLoad(WebLocalFrame* frame, |
| // Public methods - ----------------------------------------------------------- |
| -void BlinkTestRunner::Reset() { |
| +void BlinkTestRunner::Reset(bool for_new_test) { |
| // The proxy_ is always non-NULL, it is set right after construction. |
| proxy_->set_widget(render_view()->GetWebView()); |
| proxy_->Reset(); |
| @@ -851,9 +851,11 @@ void BlinkTestRunner::Reset() { |
| current_entry_indexes_.clear(); |
| render_view()->ClearEditCommands(); |
| - if (render_view()->GetWebView()->mainFrame()->isWebLocalFrame()) |
| - render_view()->GetWebView()->mainFrame()->setName(WebString()); |
| - render_view()->GetWebView()->mainFrame()->clearOpener(); |
| + if (for_new_test) { |
|
dcheng
2016/02/23 00:11:32
I'm not quite sure what the right thing to do here
|
| + if (render_view()->GetWebView()->mainFrame()->isWebLocalFrame()) |
| + render_view()->GetWebView()->mainFrame()->setName(WebString()); |
| + render_view()->GetWebView()->mainFrame()->clearOpener(); |
| + } |
| // Resetting the internals object also overrides the WebPreferences, so we |
| // have to sync them to WebKit again. |
| @@ -1001,7 +1003,7 @@ void BlinkTestRunner::OnSessionHistory( |
| void BlinkTestRunner::OnReset() { |
| LayoutTestRenderProcessObserver::GetInstance()->test_interfaces()->ResetAll(); |
| - Reset(); |
| + Reset(true /* for_new_test */); |
| // Navigating to about:blank will make sure that no new loads are initiated |
| // by the renderer. |
| render_view()->GetWebView()->mainFrame()->loadRequest( |