Use upstream layout_test baselines since the downstream ones are going away.

    BUG=none
    TEST=bots stay green
    R=eroman@chromium.org

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

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

3 files changed, 11 insertions, 14 deletions

diff --git a/chrome/browser/in_process_webkit/dom_storage_uitest.cc b/chrome/browser/in_process_webkit/dom_storage_uitest.cc
index 88cfa871..2880f75 100644
--- a/chrome/browser/in_process_webkit/dom_storage_uitest.cc
+++ b/chrome/browser/in_process_webkit/dom_storage_uitest.cc
@@ -40,8 +40,7 @@ class DOMStorageTest : public UILayoutTest {
  protected:
   DOMStorageTest()
       : UILayoutTest(),
-        test_dir_(FilePath().AppendASCII("LayoutTests").
-                  AppendASCII("storage").AppendASCII("domstorage")) {
+        test_dir_(FilePath().AppendASCII("storage").AppendASCII("domstorage")) {
   }
 
   virtual ~DOMStorageTest() { }
@@ -55,8 +54,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").
-                      AppendASCII("fast").AppendASCII("js");
+    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 b9184f8..480466f 100644
--- a/chrome/test/ui/ui_layout_test.cc
+++ b/chrome/test/ui/ui_layout_test.cc
@@ -54,16 +54,17 @@ 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");
-  rebase_result_dir_ = rebase_result_dir_.AppendASCII("data");
-  rebase_result_dir_ = rebase_result_dir_.AppendASCII("layout_tests");
+  //   third_party/WebKit/LayoutTests/platform/chromium_***/...
+  rebase_result_dir_ = src_dir.AppendASCII("third_party");
+  rebase_result_dir_ = rebase_result_dir_.AppendASCII("WebKit");
+  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);
@@ -73,9 +74,9 @@ 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_ = rebase_result_win_dir_.AppendASCII("data");
-  rebase_result_win_dir_ = rebase_result_win_dir_.AppendASCII("layout_tests");
+  rebase_result_win_dir_ = src_dir.AppendASCII("third_party");
+  rebase_result_win_dir_ = rebase_result_win_dir_.AppendASCII("WebKit");
+  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);
@@ -138,6 +139,7 @@ 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));
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 69906c4..4c7914d 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -79,7 +79,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;
@@ -313,7 +312,6 @@ TEST_F(WorkerTest, DISABLED_SharedWorkerFastLayoutTests) {
   };
 
   FilePath fast_test_dir;
-  fast_test_dir = fast_test_dir.AppendASCII("LayoutTests");
   fast_test_dir = fast_test_dir.AppendASCII("fast");
 
   FilePath worker_test_dir;
@@ -351,7 +349,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");