Revert 41769 - Fix test_shell so that eventSender works for opened windows. I've also made focus go to the webview, just like what happens in Chrome.

This is needed for https://bugs.webkit.org/show_bug.cgi?id=36147 and also fixes plugins/keyboardevents.html on Windows.

Review URL: http://codereview.chromium.org/1011005

TBR=jam@chromium.org
Review URL: http://codereview.chromium.org/997008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41781 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 7 insertions, 11 deletions

diff --git a/webkit/tools/test_shell/test_shell_win.cc b/webkit/tools/test_shell/test_shell_win.cc
index 8d7f8ec7..8ce1bcb 100644
--- a/webkit/tools/test_shell/test_shell_win.cc
+++ b/webkit/tools/test_shell/test_shell_win.cc
@@ -275,17 +275,13 @@ bool TestShell::RunFileTest(const TestParams& params) {
   if (inspector_test_mode_)
     shell->ShowDevTools();
 
-  GURL url(params.test_url);
-  if (url.is_valid()) {  // Don't hang if we have an invalid path.
-    shell->test_is_preparing_ = true;
-    shell->set_test_params(&params);
-    shell->LoadURL(url);
-    shell->test_is_preparing_ = false;
-    shell->WaitTestFinished();
-    shell->set_test_params(NULL);
-  } else {
-    NOTREACHED() << "Invalid url: " << url.spec();
-  }
+  shell->test_is_preparing_ = true;
+  shell->set_test_params(&params);
+  shell->LoadURL(GURL(params.test_url));
+
+  shell->test_is_preparing_ = false;
+  shell->WaitTestFinished();
+  shell->set_test_params(NULL);
 
   return true;
 }