Swap fallback order to search LayoutTests directory

content/common/content_paths.cc

 // Copyright (c) 2012 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 "content/public/common/content_paths.h"
 
 #include "base/file_util.h"
 #include "base/mac/bundle_locations.h"
 #include "base/path_service.h"
 
@@ skipping 21 matching lines @@
 #if defined(OS_MACOSX)
       *result = base::mac::FrameworkBundlePath();
       *result = result->Append("Libraries");
       return true;
 #else
       return PathService::Get(base::DIR_MODULE, result);
 #endif
     }
     case DIR_LAYOUT_TESTS: {
       FilePath cur;
+      if (!PathService::Get(DIR_TEST_DATA, &cur))
+        return false;
+      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(base::DIR_SOURCE_ROOT, &cur))
         return false;
       cur = cur.Append(FILE_PATH_LITERAL("third_party"));
       cur = cur.Append(FILE_PATH_LITERAL("WebKit"));
       cur = cur.Append(FILE_PATH_LITERAL("LayoutTests"));
-      if (file_util::DirectoryExists(cur)) {
-        *result = cur;
-        return true;
-      }
-      if (!PathService::Get(DIR_TEST_DATA, &cur))
-        return false;
-      cur = cur.Append(FILE_PATH_LITERAL("layout_tests"));
-      cur = cur.Append(FILE_PATH_LITERAL("LayoutTests"));
       *result = cur;
       return true;
     }
     default:
       return false;
   }
 
   return false;
 }
 
 // This cannot be done as a static initializer sadly since Visual Studio will
 // eliminate this object file if there is no direct entry point into it.
 void RegisterPathProvider() {
   PathService::RegisterProvider(PathProvider, PATH_START, PATH_END);
 }
 
 }  // namespace content