Change ui_tests to pull the directories it needs from the upstream webkit

tree directly rather than relying on webkit/data/layout_tests for the
baselines. This requires us to change a few spots in the source code
because the directory naming conventions for platform-specific baselines
is different upstream (it's platform/chromium-win/foo rather than
platform/chromium-win/LayoutTests/foo).

Once this test lands we can (in theory) remove the downstream layout test baselines.

    BUG=none
    TEST=none
    R=dimich@chromium.org

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

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

3 files changed, 14 insertions, 11 deletions

diff --git a/chrome/browser/in_process_webkit/dom_storage_uitest.cc b/chrome/browser/in_process_webkit/dom_storage_uitest.cc
index 1618d50..709c75a 100644
--- a/chrome/browser/in_process_webkit/dom_storage_uitest.cc
+++ b/chrome/browser/in_process_webkit/dom_storage_uitest.cc
@@ -42,7 +42,7 @@ class DOMStorageTest : public UILayoutTest {
  protected:
   DOMStorageTest()
       : UILayoutTest(),
-        test_dir_(FilePath().AppendASCII("LayoutTests").
+        test_dir_(FilePath().
                   AppendASCII("storage").AppendASCII("domstorage")) {
   }
 
@@ -57,7 +57,7 @@ class DOMStorageTest : public UILayoutTest {
   // Add those to the list to be copied.
   void AddJSTestResources() {
     // Add other paths our tests require.
-    FilePath js_dir = FilePath().AppendASCII("LayoutTests").
+    FilePath js_dir = FilePath().
                       AppendASCII("fast").AppendASCII("js");
     AddResourceForLayoutTest(js_dir, FilePath().AppendASCII("resources"));
   }
diff --git a/chrome/test/ui/ui_layout_test.cc b/chrome/test/ui/ui_layout_test.cc
index 8c31394..f5be28d 100644
--- a/chrome/test/ui/ui_layout_test.cc
+++ b/chrome/test/ui/ui_layout_test.cc
@@ -55,16 +55,19 @@ void UILayoutTest::InitializeForLayoutTest(const FilePath& test_parent_dir,
   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_ = 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.
-  //   webkit/data/layout_tests/platform/chromium_***/LayoutTests/...
-  rebase_result_dir_ = src_dir.AppendASCII("webkit");
+  //   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_ = rebase_result_dir_.AppendASCII(kPlatformName);
   rebase_result_dir_ = rebase_result_dir_.Append(test_parent_dir);
@@ -74,9 +77,11 @@ void UILayoutTest::InitializeForLayoutTest(const FilePath& test_parent_dir,
   // 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("webkit");
+  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);
@@ -92,6 +97,7 @@ void UILayoutTest::InitializeForLayoutTest(const FilePath& test_parent_dir,
   // like .../LayoutTests/fast/workers/.... Otherwise those layout tests
   // dealing with location property, like worker-location.html, could fail.
   new_layout_test_dir_ = temp_test_dir_;
+  new_layout_test_dir_ = new_layout_test_dir_.AppendASCII("LayoutTests");
   new_layout_test_dir_ = new_layout_test_dir_.Append(test_parent_dir);
   if (port == kHttpPort) {
     new_http_root_dir_ = new_layout_test_dir_;
@@ -139,11 +145,13 @@ void UILayoutTest::AddResourceForLayoutTest(const FilePath& parent_dir,
   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");
   src_dir = src_dir.Append(parent_dir);
   src_dir = src_dir.Append(resource_dir);
   ASSERT_TRUE(file_util::DirectoryExists(src_dir));
 
-  FilePath dest_parent_dir = temp_test_dir_.Append(parent_dir);
+  FilePath dest_parent_dir = temp_test_dir_.
+      AppendASCII("LayoutTests").Append(parent_dir);
   ASSERT_TRUE(file_util::CreateDirectory(dest_parent_dir));
   FilePath dest_dir = dest_parent_dir.Append(resource_dir);
   ASSERT_TRUE(file_util::CopyDirectory(src_dir, dest_dir, true));
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 71a8a4a..1031586a 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -103,7 +103,6 @@ class WorkerTest : public UILayoutTest {
 
   void RunWorkerFastLayoutTest(const std::string& test_case_file_name) {
     FilePath fast_test_dir;
-    fast_test_dir = fast_test_dir.AppendASCII("LayoutTests");
     fast_test_dir = fast_test_dir.AppendASCII("fast");
 
     FilePath worker_test_dir;
@@ -388,7 +387,6 @@ TEST_F(WorkerTest, FLAKY_WorkerHttpLayoutTests) {
   };
 
   FilePath http_test_dir;
-  http_test_dir = http_test_dir.AppendASCII("LayoutTests");
   http_test_dir = http_test_dir.AppendASCII("http");
   http_test_dir = http_test_dir.AppendASCII("tests");
 
@@ -409,7 +407,6 @@ TEST_F(WorkerTest, WorkerWebSocketLayoutTests) {
   };
 
   FilePath websocket_test_dir;
-  websocket_test_dir = websocket_test_dir.AppendASCII("LayoutTests");
   websocket_test_dir = websocket_test_dir.AppendASCII("websocket");
   websocket_test_dir = websocket_test_dir.AppendASCII("tests");
 
@@ -450,7 +447,6 @@ TEST_F(WorkerTest, DISABLED_WorkerXhrHttpLayoutTests) {
   };
 
   FilePath http_test_dir;
-  http_test_dir = http_test_dir.AppendASCII("LayoutTests");
   http_test_dir = http_test_dir.AppendASCII("http");
   http_test_dir = http_test_dir.AppendASCII("tests");
 
@@ -485,7 +481,6 @@ TEST_F(WorkerTest, FLAKY_MessagePorts) {
   };
 
   FilePath fast_test_dir;
-  fast_test_dir = fast_test_dir.AppendASCII("LayoutTests");
   fast_test_dir = fast_test_dir.AppendASCII("fast");
 
   FilePath worker_test_dir;