diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-07 08:44:26 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-07 08:44:26 +0000 |
| commit | 0bfe175a16a50b9a38e4fbcd23737a54544872a3 (patch) | |
| tree | f09915ef08246ac013fa3bbcdafd1df049c5abfe /content/shell/webkit_test_controller.cc | |
| parent | f53da3970187a0ac5592b849ea44c5e2e8a0470b (diff) | |
| download | chromium_src-0bfe175a16a50b9a38e4fbcd23737a54544872a3.zip chromium_src-0bfe175a16a50b9a38e4fbcd23737a54544872a3.tar.gz chromium_src-0bfe175a16a50b9a38e4fbcd23737a54544872a3.tar.bz2 | |
[content shell] eliminate the pause between reset and starting a new test
When receiving the configuration for the next test, we don't immediately set the
config but wait for the render view to navigate to the next test. Only then,
reset all test interfaces, and apply the new config
BUG=171128
R=marja@chromium.org
Review URL: https://codereview.chromium.org/12597002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@186654 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/shell/webkit_test_controller.cc')
| -rw-r--r-- | content/shell/webkit_test_controller.cc | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/content/shell/webkit_test_controller.cc b/content/shell/webkit_test_controller.cc index 1a5acb5..f6a2b51 100644 --- a/content/shell/webkit_test_controller.cc +++ b/content/shell/webkit_test_controller.cc @@ -264,7 +264,6 @@ bool WebKitTestController::ResetAfterLayoutTest() { prefs_ = webkit_glue::WebPreferences(); should_override_prefs_ = false; watchdog_.Cancel(); - Send(new ShellViewMsg_ResetAll); return true; } @@ -416,7 +415,7 @@ void WebKitTestController::DiscardMainWindow() { void WebKitTestController::SendTestConfiguration() { RenderViewHost* render_view_host = main_window_->web_contents()->GetRenderViewHost(); - ShellViewMsg_SetTestConfiguration_Params params; + ShellTestConfiguration params; params.current_working_directory = current_working_directory_; params.temp_path = temp_path_; params.test_url = test_url_; |