Rebaseline worker-constructor.html and enable it and other 2 tests in running in UI test.

BUG=none
TEST=none

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

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

2 files changed, 5 insertions, 4 deletions

diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index b2b13ad..e493203 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -300,8 +300,9 @@ TEST_F(WorkerTest, WorkerFastLayoutTests) {
   static const char* kLayoutTestFiles[] = {
     "stress-js-execution.html",
     "use-machine-stack.html",
+    "worker-call.html",
     "worker-close.html",
-    //"worker-constructor.html",
+    "worker-constructor.html",
     "worker-context-gc.html",
     "worker-event-listener.html",
     "worker-gc.html",
@@ -330,7 +331,7 @@ TEST_F(WorkerTest, WorkerHttpLayoutTests) {
   static const char* kLayoutTestFiles[] = {
     // flakey? BUG 16934 "text-encoding.html",
     "worker-importScripts.html",
-    //"worker-redirect.html",
+    "worker-redirect.html",
   };
 
   FilePath http_test_dir;
diff --git a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/workers/worker-constructor-expected.txt b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/workers/worker-constructor-expected.txt
index 8dde63c..a3653c9 100644
--- a/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/workers/worker-constructor-expected.txt
+++ b/webkit/data/layout_tests/platform/chromium-win/LayoutTests/fast/workers/worker-constructor-expected.txt
@@ -3,8 +3,8 @@ Test Worker constructor functionality. Should print a series of PASS messages, f
 PASS: toString exception propagated correctly.

 PASS: trying to create workers recursively resulted in an exception (RangeError: Maximum call stack size exceeded)

 PASS: invoking Worker constructor without arguments resulted in an exception (SyntaxError: Not enough arguments)

-PASS: onerror invoked for an empty script URL.

-PASS: onerror invoked for an invalid script URL.

+PASS: invoking Worker constructor with empty script URL resulted in an exception (Error: SYNTAX_ERR: DOM Exception 12)

+PASS: invoking Worker constructor with invalid script URL resulted in an exception (Error: SYNTAX_ERR: DOM Exception 12)

 PASS: onerror invoked for a script that could not be loaded.

 PASS: Successfully created worker.

 DONE