Reverting 26919.

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

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

4 files changed, 2 insertions, 67 deletions

diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 0185dad..3c92d49 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -3941,10 +3941,6 @@
           ],
         }],
         ['OS=="mac"', {
-          'sources': [
-            'app/keystone_glue.h',
-            'app/keystone_glue.m',
-          ],
           'sources!': [
             # TODO(port)
             'app/chrome_main_uitest.cc',
@@ -3997,6 +3993,7 @@
             'common/logging_chrome_uitest.cc',
             'test/ui/npapi_uitest.cc',
             'test/ui/sandbox_uitests.cc',
+            'worker/worker_uitest.cc',
           ],
         }],
       ],
diff --git a/chrome/test/ui/ui_layout_test.cc b/chrome/test/ui/ui_layout_test.cc
index 9fab8c0..dc0a4a2 100644
--- a/chrome/test/ui/ui_layout_test.cc
+++ b/chrome/test/ui/ui_layout_test.cc
@@ -142,25 +142,6 @@ void UILayoutTest::InitializeForLayoutTest(const FilePath& test_parent_dir,
   ASSERT_TRUE(file_util::ReadFileToString(path, &layout_test_controller_));
 }
 
-void UILayoutTest::AddResourceForLayoutTest(const FilePath& parent_dir,
-                                            const FilePath& resource_dir) {
-  FilePath root_dir;
-  PathService::Get(base::DIR_SOURCE_ROOT, &root_dir);
-
-  FilePath src_dir = root_dir.AppendASCII("chrome");
-  src_dir = src_dir.AppendASCII("test");
-  src_dir = src_dir.AppendASCII("data");
-  src_dir = src_dir.AppendASCII("layout_tests");
-  src_dir = src_dir.Append(parent_dir);
-  src_dir = src_dir.Append(resource_dir);
-  ASSERT_TRUE(file_util::DirectoryExists(src_dir));
-
-  FilePath dest_parent_dir = temp_test_dir_.Append(parent_dir);
-  ASSERT_TRUE(file_util::CreateDirectory(dest_parent_dir));
-  FilePath dest_dir = dest_parent_dir.Append(resource_dir);
-  ASSERT_TRUE(file_util::CopyDirectory(src_dir, dest_dir, true));
-}
-
 void UILayoutTest::RunLayoutTest(const std::string& test_case_file_name,
                                  bool is_http_test) {
   SCOPED_TRACE(test_case_file_name.c_str());
diff --git a/chrome/test/ui/ui_layout_test.h b/chrome/test/ui/ui_layout_test.h
index 3770478..49d6a63 100644
--- a/chrome/test/ui/ui_layout_test.h
+++ b/chrome/test/ui/ui_layout_test.h
@@ -16,8 +16,6 @@ class UILayoutTest : public UITest {
   void InitializeForLayoutTest(const FilePath& test_parent_dir,
                                const FilePath& test_case_dir,
                                bool is_http_test);
-  void AddResourceForLayoutTest(const FilePath& parent_dir,
-                                const FilePath& resource_dir);
   void RunLayoutTest(const std::string& test_case_file_name,
                      bool is_http_test);
 
diff --git a/chrome/worker/worker_uitest.cc b/chrome/worker/worker_uitest.cc
index 15c4e3f..4f1e189 100644
--- a/chrome/worker/worker_uitest.cc
+++ b/chrome/worker/worker_uitest.cc
@@ -38,28 +38,16 @@ TEST_F(WorkerTest, MultipleWorkers) {
 TEST_F(WorkerTest, WorkerFastLayoutTests) {
   static const char* kLayoutTestFiles[] = {
     "stress-js-execution.html",
-#if defined(OS_WIN)
-    // Workers don't properly initialize the V8 stack guard.
-    // (http://code.google.com/p/chromium/issues/detail?id=21653).
     "use-machine-stack.html",
-#endif
     "worker-call.html",
-    "worker-cloneport.html",
-    // Disabled because worker exceptions outside of script eval() are not
-    // reported (http://code.google.com/p/chromium/issues/detail?id=20953)
-    // "worker-close.html",
+    //"worker-close.html",
     "worker-constructor.html",
     "worker-context-gc.html",
-    "worker-context-multi-port.html",
     "worker-event-listener.html",
     "worker-gc.html",
-    // worker-lifecycle.html relies on layoutTestController.workerThreadCount
-    // which is not currently implemented.
-    // "worker-lifecycle.html",
     "worker-location.html",
     "worker-messageport.html",
     "worker-messageport-gc.html",
-    "worker-multi-port.html",
     "worker-navigator.html",
     "worker-replace-global-constructor.html",
     "worker-replace-self.html",
@@ -76,12 +64,6 @@ TEST_F(WorkerTest, WorkerFastLayoutTests) {
   worker_test_dir = worker_test_dir.AppendASCII("workers");
   InitializeForLayoutTest(fast_test_dir, worker_test_dir, false);
 
-  // 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");
-  AddResourceForLayoutTest(js_dir, resource_dir);
-
   for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
     RunLayoutTest(kLayoutTestFiles[i], false);
 }
@@ -89,11 +71,7 @@ TEST_F(WorkerTest, WorkerFastLayoutTests) {
 TEST_F(WorkerTest, WorkerHttpLayoutTests) {
   static const char* kLayoutTestFiles[] = {
     // 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",
   };
 
@@ -115,11 +93,7 @@ TEST_F(WorkerTest, WorkerHttpLayoutTests) {
 TEST_F(WorkerTest, WorkerXhrHttpLayoutTests) {
   static const char* kLayoutTestFiles[] = {
     "abort-exception-assert.html",
-#if defined(OS_WIN)
-    // Fails on the mac (and linux?):
-    // http://code.google.com/p/chromium/issues/detail?id=22599
     "close.html",
-#endif
     //"methods-async.html",
     //"methods.html",
     "xmlhttprequest-file-not-found.html"
@@ -153,7 +127,6 @@ TEST_F(WorkerTest, MessagePorts) {
     "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",
@@ -167,19 +140,10 @@ TEST_F(WorkerTest, MessagePorts) {
   worker_test_dir = worker_test_dir.AppendASCII("events");
   InitializeForLayoutTest(fast_test_dir, worker_test_dir, false);
 
-  // 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");
-  AddResourceForLayoutTest(js_dir, resource_dir);
-
   for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
     RunLayoutTest(kLayoutTestFiles[i], false);
 }
 
-// Disable LimitPerPage on Linux. Seems to work on Mac though:
-// http://code.google.com/p/chromium/issues/detail?id=22608
-#if !defined(OS_LINUX)
 TEST_F(WorkerTest, LimitPerPage) {
   int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate;
   GURL url = GetTestUrl(L"workers", L"many_workers.html");
@@ -192,11 +156,7 @@ TEST_F(WorkerTest, LimitPerPage) {
   EXPECT_EQ(max_workers_per_tab + 1 + (UITest::in_process_renderer() ? 0 : 1),
             UITest::GetBrowserProcessCount());
 }
-#endif
 
-// Disable LimitTotal on Linux and Mac.
-// http://code.google.com/p/chromium/issues/detail?id=22608
-#if defined(OS_WIN)
 TEST_F(WorkerTest, LimitTotal) {
   int max_workers_per_tab = WorkerService::kMaxWorkersPerTabWhenSeparate;
   int total_workers = WorkerService::kMaxWorkersWhenSeparate;
@@ -223,4 +183,3 @@ TEST_F(WorkerTest, LimitTotal) {
   EXPECT_EQ(total_workers + 1 + (UITest::in_process_renderer() ? 0 : tab_count),
             UITest::GetBrowserProcessCount());
 }
-#endif