Enable WorkerTest.WorkerCloseFast

The underlying issue was fixed upstream (http://trac.webkit.org/changeset/57349)
Added the generic LayoutTests/platform/chromium dir to lookup chain, since expected results for this test only differ in v8 error text formatting.
BUG=36630
TEST=enabled one

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

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

4 files changed, 28 insertions, 23 deletions

diff --git a/DEPS b/DEPS
index 6923f7c..a1b69e6 100644
--- a/DEPS
+++ b/DEPS
@@ -105,6 +105,9 @@ deps = {
   "src/chrome/test/data/layout_tests/LayoutTests/http/tests/xmlhttprequest":
     Var("webkit_trunk") + "/LayoutTests/http/tests/xmlhttprequest@" +
     Var("webkit_revision"),
+  "src/chrome/test/data/layout_tests/LayoutTests/platform/chromium/fast/workers":
+    Var("webkit_trunk") + "/LayoutTests/platform/chromium/fast/workers@" +
+    Var("webkit_revision"),
   "src/chrome/test/data/layout_tests/LayoutTests/platform/chromium-mac/fast/events":
     Var("webkit_trunk") + "/LayoutTests/platform/chromium-mac/fast/events@" +
     Var("webkit_revision"),
diff --git a/chrome/test/ui/ui_layout_test.cc b/chrome/test/ui/ui_layout_test.cc
index f5be28d..73556a9 100644
--- a/chrome/test/ui/ui_layout_test.cc
+++ b/chrome/test/ui/ui_layout_test.cc
@@ -47,45 +47,44 @@ void UILayoutTest::InitializeForLayoutTest(const FilePath& test_parent_dir,
   FilePath src_dir;
   PathService::Get(base::DIR_SOURCE_ROOT, &src_dir);
 
+  src_dir = src_dir.AppendASCII("chrome");
+  src_dir = src_dir.AppendASCII("test");
+  src_dir = src_dir.AppendASCII("data");
+  src_dir = src_dir.AppendASCII("layout_tests");
+  src_dir = src_dir.AppendASCII("LayoutTests");
+
   // Gets the file path to WebKit ui layout tests, that is,
   //   chrome/test/data/ui_tests/LayoutTests/...
   // Note that we have to use our own copy of WebKit layout tests because our
   // build machines do not have WebKit layout tests added.
-  layout_test_dir_ = src_dir.AppendASCII("chrome");
-  layout_test_dir_ = layout_test_dir_.AppendASCII("test");
-  layout_test_dir_ = layout_test_dir_.AppendASCII("data");
-  layout_test_dir_ = layout_test_dir_.AppendASCII("layout_tests");
-  layout_test_dir_ = layout_test_dir_.AppendASCII("LayoutTests");
-  layout_test_dir_ = layout_test_dir_.Append(test_parent_dir);
+  layout_test_dir_ = src_dir.Append(test_parent_dir);
   layout_test_dir_ = layout_test_dir_.Append(test_case_dir);
   ASSERT_TRUE(file_util::DirectoryExists(layout_test_dir_));
 
   // Gets the file path to rebased expected result directory for the current
   // platform.
   //   chrome/test/data/layout_tests/LayoutTests/platform/chromium_***/...
-  rebase_result_dir_ = src_dir.AppendASCII("chrome");
-  rebase_result_dir_ = rebase_result_dir_.AppendASCII("test");
-  rebase_result_dir_ = rebase_result_dir_.AppendASCII("data");
-  rebase_result_dir_ = rebase_result_dir_.AppendASCII("layout_tests");
-  rebase_result_dir_ = rebase_result_dir_.AppendASCII("LayoutTests");
-  rebase_result_dir_ = rebase_result_dir_.AppendASCII("platform");
+  rebase_result_dir_ = src_dir.AppendASCII("platform");
   rebase_result_dir_ = rebase_result_dir_.AppendASCII(kPlatformName);
   rebase_result_dir_ = rebase_result_dir_.Append(test_parent_dir);
   rebase_result_dir_ = rebase_result_dir_.Append(test_case_dir);
 
+  // Generic chromium expected results. Not OS-specific. For example,
+  // v8-specific differences go here.
+  // chrome/test/data/layout_tests/LayoutTests/platform/chromium/...
+  rebase_result_chromium_dir_ = src_dir.AppendASCII("platform")
+                                       .AppendASCII("chromium")
+                                       .Append(test_parent_dir)
+                                       .Append(test_case_dir);
+
   // Gets the file path to rebased expected result directory under the
   // win32 platform. This is used by other non-win32 platform to use the same
   // rebased expected results.
 #if !defined(OS_WIN)
-  rebase_result_win_dir_ = src_dir.AppendASCII("chrome");
-  rebase_result_win_dir_ = rebase_result_win_dir_.AppendASCII("test");
-  rebase_result_win_dir_ = rebase_result_win_dir_.AppendASCII("data");
-  rebase_result_win_dir_ = rebase_result_win_dir_.AppendASCII("layout_tests");
-  rebase_result_win_dir_ = rebase_result_win_dir_.AppendASCII("LayoutTests");
-  rebase_result_win_dir_ = rebase_result_win_dir_.AppendASCII("platform");
-  rebase_result_win_dir_ = rebase_result_win_dir_.AppendASCII("chromium-win");
-  rebase_result_win_dir_ = rebase_result_win_dir_.Append(test_parent_dir);
-  rebase_result_win_dir_ = rebase_result_win_dir_.Append(test_case_dir);
+  rebase_result_win_dir_ = src_dir.AppendASCII("platform")
+                                  .AppendASCII("chromium-win")
+                                  .Append(test_parent_dir)
+                                  .Append(test_case_dir);
 #endif
 
   // Creates the temporary directory.
@@ -217,6 +216,9 @@ void UILayoutTest::RunLayoutTest(const std::string& test_case_file_name,
   std::string expected_result_value;
   if (!ReadExpectedResult(rebase_result_dir_,
                           test_case_file_name,
+                          &expected_result_value) &&
+      !ReadExpectedResult(rebase_result_chromium_dir_,
+                          test_case_file_name,
                           &expected_result_value)) {
     if (rebase_result_win_dir_.empty() ||
         !ReadExpectedResult(rebase_result_win_dir_,
diff --git a/chrome/test/ui/ui_layout_test.h b/chrome/test/ui/ui_layout_test.h
index c1f1fe1..60de501 100644
--- a/chrome/test/ui/ui_layout_test.h
+++ b/chrome/test/ui/ui_layout_test.h
@@ -33,6 +33,7 @@ class UILayoutTest : public UITest {
   FilePath new_http_root_dir_;
   FilePath new_layout_test_dir_;
   FilePath rebase_result_dir_;
+  FilePath rebase_result_chromium_dir_;
   FilePath rebase_result_win_dir_;
   std::string layout_test_controller_;
 
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 557ab5b..57330ca 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -217,8 +217,7 @@ TEST_F(WorkerTest, DISABLED_WorkerClonePort) {
   RunWorkerFastLayoutTest("worker-cloneport.html");
 }
 
-// Hangs. http://crbug.com/36630
-TEST_F(WorkerTest, DISABLED_WorkerCloseFast) {
+TEST_F(WorkerTest, WorkerCloseFast) {
   RunWorkerFastLayoutTest("worker-close.html");
 }