Rewrite layout_browsertests to use content_shell --dump-render-tree to execute layout tests

content/browser/worker_host/test/worker_browsertest.cc

Index: content/browser/worker_host/test/worker_browsertest.cc
diff --git a/content/browser/worker_host/test/worker_browsertest.cc b/content/browser/worker_host/test/worker_browsertest.cc
index f45eb442e9dbff0820e2c49d736f2ec51c8d1873..1e1913ed0d0de27c6f8a620e8962ff766906db7f 100644
--- a/content/browser/worker_host/test/worker_browsertest.cc
+++ b/content/browser/worker_host/test/worker_browsertest.cc
@@ -32,12 +32,6 @@ class WorkerLayoutTest : public InProcessBrowserLayoutTest {
   WorkerLayoutTest() : InProcessBrowserLayoutTest(
       FilePath(), FilePath().AppendASCII("fast").AppendASCII("workers")) {
   }
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    InProcessBrowserLayoutTest::SetUpInProcessBrowserTestFixture();
-    AddResourceForLayoutTest(
-        FilePath().AppendASCII("fast").AppendASCII("js"),
-        FilePath().AppendASCII("resources"));
-  }
 };
 
 // Crashy, http://crbug.com/35965.
@@ -133,12 +127,6 @@ class MessagePortTest : public InProcessBrowserLayoutTest {
   MessagePortTest() : InProcessBrowserLayoutTest(
       FilePath(), FilePath().AppendASCII("fast").AppendASCII("events")) {
   }
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    InProcessBrowserLayoutTest::SetUpInProcessBrowserTestFixture();
-    AddResourceForLayoutTest(
-        FilePath().AppendASCII("fast").AppendASCII("js"),
-        FilePath().AppendASCII("resources"));
-  }
 };
 
 // Flaky, http://crbug.com/34996.
@@ -175,12 +163,6 @@ class WorkerHttpLayoutTest : public InProcessBrowserLayoutTest {
       FilePath().AppendASCII("workers"),
       8000) {
   }
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    InProcessBrowserLayoutTest::SetUpInProcessBrowserTestFixture();
-    AddResourceForLayoutTest(
-        FilePath().AppendASCII("http").AppendASCII("tests"),
-        FilePath().AppendASCII("resources"));
-  }
 };
 
 // http://crbug.com/16934
@@ -208,17 +190,13 @@ class WorkerXHRHttpLayoutTest : public InProcessBrowserLayoutTest {
       FilePath().AppendASCII("xmlhttprequest").AppendASCII("workers"),
       -1) {
   }
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    InProcessBrowserLayoutTest::SetUpInProcessBrowserTestFixture();
-    AddResourceForLayoutTest(
-        FilePath().AppendASCII("http").AppendASCII("tests"),
-        FilePath().AppendASCII("workers").AppendASCII("resources"));
-  }
 };
 
 IN_PROC_BROWSER_TEST_F(WorkerXHRHttpLayoutTest, Tests) {
   static const char* kLayoutTestFiles[] = {
-    "abort-exception-assert.html",
+    // worker thread count never drops to zero.
+    // http://crbug.com/150565
+    // "abort-exception-assert.html",

[jam, 2012/09/18 20:04:08]

how did this work before?

[jam, 2012/09/18 20:29:53]

ah, ok, lgtm

 #if defined(OS_WIN)
     // Fails on the mac (and linux?):
     // http://code.google.com/p/chromium/issues/detail?id=22599