Allow layout tests to be located both in src/webkit/data/layout_tests and...

webkit/tools/layout_tests/layout_package/platform_utils_win.py

 # Copyright (c) 2006-2008 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.
 
 """Platform specific utility methods.  This file contains methods that are
 specific to running the layout tests on windows.
 
 This file constitutes a complete wrapper for google.platform_utils_win,
 implementing or mapping all needed functions from there.  Layout-test scripts
 should be able to import only this file (via platform_utils.py), with no need
@@ skipping 100 matching lines @@
     WebKit http tests that have been modified and are temporarily in pending/
     will still fail, if they expect the DocumentRoot to be located as described
     above.)
 
     Args:
       output_dir: the path to the test output directory.  It will be created.
       apache2: boolean if true will cause this function to return start
                command for Apache 2.x instead of Apache 1.3.x
     """
     layout_dir = google.platform_utils_win.GetCygwinPath(
-        layout_package_path_utils.LayoutDataDir())
+        layout_package_path_utils.LayoutTestsDir())
     main_document_root = os.path.join(layout_dir, "LayoutTests",
                                       "http", "tests")
     pending_document_root = os.path.join(layout_dir, "pending",
                                          "http", "tests")
     chrome_document_root = layout_dir
     apache_config_dir = google.httpd_utils.ApacheConfigDir(self._base_dir)
     mime_types_path = os.path.join(apache_config_dir, "mime.types")
 
     conf_file_name = "httpd.conf"
     if apache2:
@@ skipping 75 matching lines @@
   def PlatformDir(self):
     """Returns the most specific directory name where platform-specific
     results live.
     """
     return 'chromium-win'
 
   def PlatformNewResultsDir(self):
     """Returns the directory name in which to output newly baselined tests.
     """
     return self.PlatformDir()