TBR=dglazkov

- Roll WebKit to r49473
- Re-enable failing ui_tests due to last roll
- Remove some failing layout tests expectations

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

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

3 files changed, 11 insertions, 27 deletions

diff --git a/DEPS b/DEPS
index bcc27a6..bd31551 100644
--- a/DEPS
+++ b/DEPS
@@ -1,7 +1,7 @@
 vars = {
   "webkit_trunk":
     "http://svn.webkit.org/repository/webkit/trunk",
-  "webkit_revision": "49432",
+  "webkit_revision": "49473",
   "ffmpeg_revision": "28488",
 }
 
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 21e6a05..51a8019 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -34,13 +34,11 @@ class WorkerTest : public UILayoutTest {
   }
 };
 
-// This test fails after WebKit merge 49414:49432. (BUG=24652)
-TEST_F(WorkerTest, DISABLED_SingleWorker) {
+TEST_F(WorkerTest, SingleWorker) {
   RunTest(L"single_worker.html");
 }
 
-// This test fails after WebKit merge 49414:49432. (BUG=24652)
-TEST_F(WorkerTest, DISABLED_MultipleWorkers) {
+TEST_F(WorkerTest, MultipleWorkers) {
   RunTest(L"multi_worker.html");
 }
 
@@ -49,8 +47,7 @@ TEST_F(WorkerTest, DISABLED_MultipleWorkers) {
 #define WorkerFastLayoutTests DISABLED_WorkerFastLayoutTests
 #endif
 
-// This test fails after WebKit merge 49414:49432. (BUG=24652)
-TEST_F(WorkerTest, DISABLED_WorkerFastLayoutTests) {
+TEST_F(WorkerTest, WorkerFastLayoutTests) {
   static const char* kLayoutTestFiles[] = {
     "stress-js-execution.html",
 #if defined(OS_WIN)
@@ -131,8 +128,7 @@ TEST_F(WorkerTest, WorkerHttpLayoutTests) {
   StopHttpServer();
 }
 
-// This test fails after WebKit merge 49414:49432. (BUG=24652)
-TEST_F(WorkerTest, DISABLED_WorkerXhrHttpLayoutTests) {
+TEST_F(WorkerTest, WorkerXhrHttpLayoutTests) {
   static const char* kLayoutTestFiles[] = {
     "abort-exception-assert.html",
 #if defined(OS_WIN)
@@ -203,7 +199,7 @@ TEST_F(WorkerTest, MessagePorts) {
 // http://code.google.com/p/chromium/issues/detail?id=22608
 #if !defined(OS_LINUX)
 // This test fails after WebKit merge 49414:49432. (BUG=24652)
-TEST_F(WorkerTest, DISABLED_LimitPerPage) {
+TEST_F(WorkerTest, LimitPerPage) {
   int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate;
   GURL url = GetTestUrl(L"workers", L"many_workers.html");
   url = GURL(url.spec() + StringPrintf("?count=%d", max_workers_per_tab + 1));
@@ -218,7 +214,7 @@ TEST_F(WorkerTest, DISABLED_LimitPerPage) {
 #endif
 
 // This test fails after WebKit merge 49414:49432. (BUG=24652)
-TEST_F(WorkerTest, DISABLED_LimitTotal) {
+TEST_F(WorkerTest, LimitTotal) {
   int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate;
   int total_workers = WorkerService::kMaxWorkersWhenSeparate;
 
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index eacf034..6787814 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -514,8 +514,7 @@ BUG18978 MAC : LayoutTests/http/tests/xmlhttprequest/methods.html = FAIL TIMEOUT
 BUG8941 LINUX WIN SLOW : LayoutTests/http/tests/xmlhttprequest/web-apps/013.html = FAIL
 BUG8941 MAC DEBUG SLOW : LayoutTests/http/tests/xmlhttprequest/web-apps/013.html = FAIL
 BUG8941 MAC RELEASE : LayoutTests/http/tests/xmlhttprequest/web-apps/013.html = FAIL TIMEOUT
-// Crashes after Webit merge 49414:49432
-// BUG_HCLAM BUG8941 WIN LINUX : LayoutTests/http/tests/xmlhttprequest/web-apps/012.html = FAIL
+BUG8941 WIN LINUX : LayoutTests/http/tests/xmlhttprequest/web-apps/012.html = FAIL
 
 // -----------------------------------------------------------------
 // TEXT
@@ -1289,8 +1288,7 @@ BUG10324 WIN LINUX MAC : LayoutTests/editing/selection/caret-rtl-2.html = IMAGE
 // upstream
 // Expectations for this test changed upstream. We should fix this test, but
 // it doesn't need to block the current release
-// Crashes after WebKit toll 49414:49427
-// BUG_HCLAM BUG10325 WIN : LayoutTests/fast/dom/resource-locations-in-created-html-document.html = FAIL
+BUG10325 WIN : LayoutTests/fast/dom/resource-locations-in-created-html-document.html = FAIL
 
 BUG10326 DEBUG : LayoutTests/http/tests/messaging/cross-domain-message-event-dispatch.html = TIMEOUT FAIL PASS
 
@@ -3157,8 +3155,7 @@ BUG_HAMAJI : LayoutTests/fast/css/counters/t1204-increment-00-c-o.html = FAIL
 BUG_HAMAJI : LayoutTests/fast/css/counters/t1204-increment-01-c-o.html = FAIL
 
 // Failing after r28267
-// Crashes after WebKit merge 49414:49427
-// BUG_HCLAM BUG24116 SLOW : LayoutTests/http/tests/loading/gmail-assert-on-load.html = FAIL
+BUG24116 SLOW : LayoutTests/http/tests/loading/gmail-assert-on-load.html = FAIL
 
 // Failing at WebKit Linux (dbg)(3) build 7795
 BUG24119 LINUX DEBUG : LayoutTests/tables/mozilla/bugs/bug1220.html = PASS FAIL
@@ -3193,14 +3190,5 @@ BUG_HCLAM : LayoutTests/http/tests/xmlhttprequest/logout.html = FAIL
 BUG_HCLAM : LayoutTests/editing/style/5228141.html = FAIL
 BUG_HCLAM : LayoutTests/editing/style/style-boundary-001.html = FAIL
 BUG_HCLAM : LayoutTests/fast/js/string-trim.html = FAIL
-BUG_HCLAM : LayoutTests/fast/dom/onload-open.html = CRASH
-BUG_HCLAM : LayoutTests/fast/dom/resource-locations-in-created-html-document.html = CRASH
-BUG_HCLAM : LayoutTests/fast/events/keypress-focus-change.html = CRASH
-BUG_HCLAM : LayoutTests/fast/events/mouseover-mouseout.html = CRASH
-BUG_HCLAM : LayoutTests/fast/events/mouseover-mouseout2.html = CRASH
-BUG_HCLAM : LayoutTests/http/tests/loading/gmail-assert-on-load.html = CRASH
-BUG_HCLAM : LayoutTests/http/tests/xmlhttprequest/frame-unload-abort-crash.html = CRASH
-BUG_HCLAM : LayoutTests/svg/custom/js-update-transform-changes.svg = CRASH
-BUG_HCLAM : LayoutTests/http/tests/xmlhttprequest/web-apps/012.html = CRASH
 BUG_HCLAM WIN MAC : LayoutTests/http/tests/xmlhttprequest/xmlhttprequest-image-not-loaded-svg.svg = CRASH
-BUG_HCLAM WIN : LayoutTests/fast/events/invalid-001.html = CRASH
+BUG_HCLAM WIN : LayoutTests/fast/loader/text-document-wrapping.html = CRASH