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

tree directly rather than relying on webkit/data/layout_tests for the
baselines. This requires us to change a few spots in the source code
because the directory naming conventions for platform-specific baselines
is different upstream (it's platform/chromium-win/foo rather than
platform/chromium-win/LayoutTests/foo).

Once this test lands we can (in theory) remove the downstream layout test baselines.

    BUG=none
    TEST=none
    R=dimich@chromium.org

Review URL: http://codereview.chromium.org/1547009

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@43557 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 2 deletions

diff --git a/chrome/browser/in_process_webkit/dom_storage_uitest.cc b/chrome/browser/in_process_webkit/dom_storage_uitest.cc
index 1618d50..709c75a 100644
--- a/chrome/browser/in_process_webkit/dom_storage_uitest.cc
+++ b/chrome/browser/in_process_webkit/dom_storage_uitest.cc
@@ -42,7 +42,7 @@ class DOMStorageTest : public UILayoutTest {
  protected:
   DOMStorageTest()
       : UILayoutTest(),
-        test_dir_(FilePath().AppendASCII("LayoutTests").
+        test_dir_(FilePath().
                   AppendASCII("storage").AppendASCII("domstorage")) {
   }
 
@@ -57,7 +57,7 @@ class DOMStorageTest : public UILayoutTest {
   // Add those to the list to be copied.
   void AddJSTestResources() {
     // Add other paths our tests require.
-    FilePath js_dir = FilePath().AppendASCII("LayoutTests").
+    FilePath js_dir = FilePath().
                       AppendASCII("fast").AppendASCII("js");
     AddResourceForLayoutTest(js_dir, FilePath().AppendASCII("resources"));
   }