From 1af63e47dd6ea5a4d4db5cf679ebe6e01fd2f45b Mon Sep 17 00:00:00 2001 From: "japhet@chromium.org" Date: Mon, 22 Mar 2010 20:50:03 +0000 Subject: WebKit merge 56312:56350 (disables a work test due to http://trac.webkit.org/changeset/56329) BUG=38918 TEST=none TBR=ajwong Review URL: http://codereview.chromium.org/1098008 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42251 0039d316-1c4b-4281-b951-d872f2087c98 --- chrome/worker/worker_uitest.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'chrome') diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc index 065ae87..69906c4 100644 --- a/chrome/worker/worker_uitest.cc +++ b/chrome/worker/worker_uitest.cc @@ -268,7 +268,8 @@ TEST_F(WorkerTest, WorkerReplaceSelf) { RunWorkerFastLayoutTest("worker-replace-self.html"); } -TEST_F(WorkerTest, WorkerScriptError) { +// http://crbug.com/38918 +TEST_F(WorkerTest, DISABLED_WorkerScriptError) { RunWorkerFastLayoutTest("worker-script-error.html"); } -- cgit v1.1