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

chrome/worker/worker_uitest.cc

 // Copyright (c) 2009 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 "base/file_path.h"
 #include "base/string_util.h"
 #include "chrome/app/chrome_dll_resource.h"
 #include "chrome/browser/worker_host/worker_service.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/automation/browser_proxy.h"
@@ skipping 85 matching lines @@
 
       PlatformThread::Sleep(sleep_timeout_ms() / 10);
     }
 
     EXPECT_EQ(number_of_processes, cur_process_count);
     return false;
   }
 
   void RunWorkerFastLayoutTest(const std::string& test_case_file_name) {
     FilePath fast_test_dir;
-    fast_test_dir = fast_test_dir.AppendASCII("LayoutTests");
     fast_test_dir = fast_test_dir.AppendASCII("fast");
 
     FilePath worker_test_dir;
     worker_test_dir = worker_test_dir.AppendASCII("workers");
     InitializeForLayoutTest(fast_test_dir, worker_test_dir, kNoHttpPort);
 
     // Worker tests also rely on common files in js/resources.
     FilePath js_dir = fast_test_dir.AppendASCII("js");
     FilePath resource_dir;
     resource_dir = resource_dir.AppendASCII("resources");
@@ skipping 264 matching lines @@
     // flakey? BUG 16934 "text-encoding.html",
 #if defined(OS_WIN)
     // Fails on the mac (and linux?):
     // http://code.google.com/p/chromium/issues/detail?id=22599
     "worker-importScripts.html",
 #endif
     "worker-redirect.html",
   };
 
   FilePath http_test_dir;
-  http_test_dir = http_test_dir.AppendASCII("LayoutTests");
   http_test_dir = http_test_dir.AppendASCII("http");
   http_test_dir = http_test_dir.AppendASCII("tests");
 
   FilePath worker_test_dir;
   worker_test_dir = worker_test_dir.AppendASCII("workers");
   InitializeForLayoutTest(http_test_dir, worker_test_dir, kHttpPort);
 
   StartHttpServer(new_http_root_dir_);
   for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
     RunLayoutTest(kLayoutTestFiles[i], kHttpPort);
   StopHttpServer();
 }
 
 TEST_F(WorkerTest, WorkerWebSocketLayoutTests) {
   static const char* kLayoutTestFiles[] = {
     "worker-simple.html",
     "shared-worker-simple.html",
   };
 
   FilePath websocket_test_dir;
-  websocket_test_dir = websocket_test_dir.AppendASCII("LayoutTests");
   websocket_test_dir = websocket_test_dir.AppendASCII("websocket");
   websocket_test_dir = websocket_test_dir.AppendASCII("tests");
 
   FilePath worker_test_dir;
   worker_test_dir = worker_test_dir.AppendASCII("workers");
   InitializeForLayoutTest(websocket_test_dir, worker_test_dir, kWebSocketPort);
   test_case_dir_ = test_case_dir_.AppendASCII("websocket");
   test_case_dir_ = test_case_dir_.AppendASCII("tests");
   test_case_dir_ = test_case_dir_.AppendASCII("workers");
 
@@ skipping 20 matching lines @@
     // Disabled due to limitations in lighttpd (does not handle methods other
     // than GET/PUT/POST).
     // "shared-worker-methods-async.html",
     // "shared-worker-methods.html",
     "shared-worker-xhr-file-not-found.html",
 
     "xmlhttprequest-file-not-found.html"
   };
 
   FilePath http_test_dir;
-  http_test_dir = http_test_dir.AppendASCII("LayoutTests");
   http_test_dir = http_test_dir.AppendASCII("http");
   http_test_dir = http_test_dir.AppendASCII("tests");
 
   FilePath worker_test_dir;
   worker_test_dir = worker_test_dir.AppendASCII("xmlhttprequest");
   worker_test_dir = worker_test_dir.AppendASCII("workers");
   InitializeForLayoutTest(http_test_dir, worker_test_dir, kHttpPort);
 
   StartHttpServer(new_http_root_dir_);
   for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
@@ skipping 14 matching lines @@
     "message-port-deleted-document.html",
     "message-port-deleted-frame.html",
     "message-port-inactive-document.html",
     "message-port-multi.html",
     "message-port-no-wrapper.html",
     // Only works with run-webkit-tests --leaks.
     // "message-channel-listener-circular-ownership.html",
   };
 
   FilePath fast_test_dir;
-  fast_test_dir = fast_test_dir.AppendASCII("LayoutTests");
   fast_test_dir = fast_test_dir.AppendASCII("fast");
 
   FilePath worker_test_dir;
   worker_test_dir = worker_test_dir.AppendASCII("events");
   InitializeForLayoutTest(fast_test_dir, worker_test_dir, kNoHttpPort);
 
   // MessagePort tests also rely on common files in js/resources.
   FilePath js_dir = fast_test_dir.AppendASCII("js");
   FilePath resource_dir;
   resource_dir = resource_dir.AppendASCII("resources");
@@ skipping 135 matching lines @@
   GURL url2 = ui_test_utils::GetTestUrl(FilePath(kTestDir),
                                         FilePath(kSingleSharedWorkersFile));
   url2 = GURL(url2.spec() + StringPrintf("?id=%d", max_workers_per_tab));
   ASSERT_TRUE(window->AppendTab(url2));
 
   std::string value = WaitUntilCookieNonEmpty(tab.get(), url,
       kTestCompleteCookie, action_max_timeout_ms());
   ASSERT_STREQ(kTestCompleteSuccess, value.c_str());
   ASSERT_TRUE(WaitForProcessCountToBe(2, max_workers_per_tab+1));
 }