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

chrome/test/ui/ui_layout_test.cc

 // Copyright (c) 2009 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/test/ui/ui_layout_test.h"
 
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "base/string_util.h"
 #include "base/test/test_file_util.h"
@@ skipping 37 matching lines @@
   PathService::Get(base::DIR_SOURCE_ROOT, &src_dir);
 
   // 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_ = 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);
   rebase_result_dir_ = rebase_result_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("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);
   rebase_result_win_dir_ = rebase_result_win_dir_.Append(test_case_dir);
 #endif
 
   // Creates the temporary directory.
   ASSERT_TRUE(file_util::CreateNewTempDirectory(
       FILE_PATH_LITERAL("chrome_ui_layout_tests_"), &temp_test_dir_));
 
   // Creates the new layout test subdirectory under the temp directory.
   // Note that we have to mimic the same layout test directory structure,
   // 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_;
     test_case_dir_ = test_case_dir;
   }
   new_layout_test_dir_ = new_layout_test_dir_.Append(test_case_dir);
   ASSERT_TRUE(file_util::CreateDirectory(new_layout_test_dir_));
 
   // Copy the resource subdirectory if it exists.
   FilePath layout_test_resource_path(layout_test_dir_);
@@ skipping 27 matching lines @@
 
 void UILayoutTest::AddResourceForLayoutTest(const FilePath& parent_dir,
                                             const FilePath& resource_dir) {
   FilePath root_dir;
   PathService::Get(base::DIR_SOURCE_ROOT, &root_dir);
 
   FilePath src_dir = root_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");
   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));
 }
 
 void UILayoutTest::RunLayoutTest(const std::string& test_case_file_name,
                                  int port) {
   SCOPED_TRACE(test_case_file_name.c_str());
 
   ASSERT_TRUE(!layout_test_controller_.empty());
@@ skipping 75 matching lines @@
                                       std::string* expected_result_value) {
   FilePath expected_result_path(result_dir_path);
   expected_result_path = expected_result_path.AppendASCII(test_case_file_name);
   expected_result_path = expected_result_path.InsertBeforeExtension(
       FILE_PATH_LITERAL("-expected"));
   expected_result_path =
       expected_result_path.ReplaceExtension(FILE_PATH_LITERAL("txt"));
   return file_util::ReadFileToString(expected_result_path,
                                      expected_result_value);
 }