Swap fallback order to search LayoutTests directory

content/common/content_paths.cc

Index: content/common/content_paths.cc
diff --git a/content/common/content_paths.cc b/content/common/content_paths.cc
index 6f828b858dd24c62c68b598dd5fae86e6502d3b3..19232b2fbca2cc65cf81957a468a55044888e5a5 100644
--- a/content/common/content_paths.cc
+++ b/content/common/content_paths.cc
@@ -39,18 +39,18 @@ bool PathProvider(int key, FilePath* result) {
     }
     case DIR_LAYOUT_TESTS: {
       FilePath cur;
-      if (!PathService::Get(base::DIR_SOURCE_ROOT, &cur))
+      if (!PathService::Get(DIR_TEST_DATA, &cur))
         return false;
-      cur = cur.Append(FILE_PATH_LITERAL("third_party"));
-      cur = cur.Append(FILE_PATH_LITERAL("WebKit"));
+      cur = cur.Append(FILE_PATH_LITERAL("layout_tests"));
       cur = cur.Append(FILE_PATH_LITERAL("LayoutTests"));

[M-A Ruel, 2012/06/20 19:42:59]

It's been 2 months and content/test/data/layout_tests/LayoutTests still doesn't
exist. Is that expected?

[jabdelmalek, 2012/06/20 19:55:34]

It would be nice to check these into content/test/data instead of
chrome/test/data for consistency (since tests in content should get their data
from content/test/data). It just needs someone to update the DEPS file and use
content_test_data in path service. That is orthogonal from this change though.

       if (file_util::DirectoryExists(cur)) {
         *result = cur;
         return true;
       }
-      if (!PathService::Get(DIR_TEST_DATA, &cur))
+      if (!PathService::Get(base::DIR_SOURCE_ROOT, &cur))
         return false;
-      cur = cur.Append(FILE_PATH_LITERAL("layout_tests"));
+      cur = cur.Append(FILE_PATH_LITERAL("third_party"));
+      cur = cur.Append(FILE_PATH_LITERAL("WebKit"));
       cur = cur.Append(FILE_PATH_LITERAL("LayoutTests"));
       *result = cur;
       return true;