Make ui_layout_test probe in third_party/WebKit/ prior to chrome/test/data_layut_tests

chrome/test/ui/ui_layout_test.cc

 // Copyright (c) 2011 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_number_conversions.h"
 #include "base/string_util.h"
@@ skipping 25 matching lines @@
 UILayoutTest::~UILayoutTest() {
   if (!temp_test_dir_.empty()) {
     // The deletion might fail because HTTP server process might not been
     // completely shut down yet and is still holding certain handle to it.
     // To work around this problem, we try to repeat the deletion several
     // times.
     EXPECT_TRUE(file_util::DieFileDie(temp_test_dir_, true));
   }
 }
 
+// Gets layout tests root. For the current git workflow, this is
+//    third_party/WebKit/LayoutTests
+// On svn workflow (including build machines) and older git workflow, this is
+//    chrome/test/data/layout_tests/LayoutTests
+// This function probes for the first and then fallbacks to the second.
+static FilePath GetLayoutTestRoot() {
+  FilePath src_root;
+  PathService::Get(base::DIR_SOURCE_ROOT, &src_root);
+
+  FilePath webkit_layout_tests = src_root;
+  webkit_layout_tests = webkit_layout_tests.AppendASCII("third_party");
+  webkit_layout_tests = webkit_layout_tests.AppendASCII("WebKit");
+  webkit_layout_tests = webkit_layout_tests.AppendASCII("LayoutTests");
+  if (file_util::DirectoryExists(webkit_layout_tests))
+    return webkit_layout_tests;
+
+  FilePath chrome_layout_tests = src_root;
+  chrome_layout_tests = chrome_layout_tests.AppendASCII("chrome");
+  chrome_layout_tests = chrome_layout_tests.AppendASCII("test");
+  chrome_layout_tests = chrome_layout_tests.AppendASCII("data");
+  chrome_layout_tests = chrome_layout_tests.AppendASCII("layout_tests");
+  chrome_layout_tests = chrome_layout_tests.AppendASCII("LayoutTests");
+  return chrome_layout_tests;
+}
+
 void UILayoutTest::InitializeForLayoutTest(const FilePath& test_parent_dir,
                                            const FilePath& test_case_dir,
                                            int port) {
-  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.
+  FilePath src_dir = GetLayoutTestRoot();
   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_***/...
+  //   $LayoutTestRoot/platform/chromium_***/...
   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")
@@ skipping 53 matching lines @@
   // Reads the layout test controller simulation script.
   FilePath path;
   PathService::Get(chrome::DIR_TEST_DATA, &path);
   path = path.AppendASCII("layout_tests");
   path = path.AppendASCII("layout_test_controller.html");
   ASSERT_TRUE(file_util::ReadFileToString(path, &layout_test_controller_));
 }
 
 void UILayoutTest::AddResourceForLayoutTest(const FilePath& parent_dir,
                                             const FilePath& resource_name) {
-  FilePath root_dir;
-  PathService::Get(base::DIR_SOURCE_ROOT, &root_dir);
-
-  FilePath source = root_dir.AppendASCII("chrome");
-  source = source.AppendASCII("test");
-  source = source.AppendASCII("data");
-  source = source.AppendASCII("layout_tests");
-  source = source.AppendASCII("LayoutTests");
+  FilePath source = GetLayoutTestRoot();
   source = source.Append(parent_dir);
   source = source.Append(resource_name);
 
   ASSERT_TRUE(file_util::PathExists(source));
 
   FilePath dest_parent_dir = temp_test_dir_.
       AppendASCII("LayoutTests").Append(parent_dir);
   ASSERT_TRUE(file_util::CreateDirectory(dest_parent_dir));
   FilePath dest = dest_parent_dir.Append(resource_name);
 
@@ skipping 107 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);
 }