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

content/browser/worker_host/test/worker_browsertest.cc

 // Copyright (c) 2012 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/bind.h"
 #include "base/file_path.h"
 #include "base/logging.h"
 #include "base/path_service.h"
 #include "base/stringprintf.h"
 #include "base/string_util.h"
@@ skipping 14 matching lines @@
 #include "googleurl/src/gurl.h"
 
 using content::BrowserThread;
 using content::WorkerServiceImpl;
 
 class WorkerLayoutTest : public InProcessBrowserLayoutTest {
  public:
   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.
 // Flaky, http://crbug.com/36555.
 IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, DISABLED_WorkerClonePort) {
   RunLayoutTest("worker-cloneport.html");
 }
 
 // http://crbug.com/101996 (started flaking with WebKit roll 98537:98582).
 IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, WorkerContextMultiPort) {
@@ skipping 75 matching lines @@
 
 IN_PROC_BROWSER_TEST_F(WorkerLayoutTest, SharedWorkerFastSimple) {
   RunLayoutTest("shared-worker-simple.html");
 }
 
 class MessagePortTest : public InProcessBrowserLayoutTest {
  public:
   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.
 IN_PROC_BROWSER_TEST_F(MessagePortTest, Tests) {
   static const char* kLayoutTestFiles[] = {
     "message-channel-gc.html",
     "message-channel-gc-2.html",
     "message-channel-gc-3.html",
     "message-channel-gc-4.html",
     "message-port.html",
@@ skipping 16 matching lines @@
 class WorkerHttpLayoutTest : public InProcessBrowserLayoutTest {
  public:
   // The resources for these tests hardcode 8000, so must use that here. If
   // multiple tests which use it run in parallel, then the test will fail but
   // it'll run again at the end in serial and pass.
   WorkerHttpLayoutTest() : InProcessBrowserLayoutTest(
       FilePath().AppendASCII("http").AppendASCII("tests"),
       FilePath().AppendASCII("workers"),
       8000) {
   }
-  virtual void SetUpInProcessBrowserTestFixture() OVERRIDE {
-    InProcessBrowserLayoutTest::SetUpInProcessBrowserTestFixture();
-    AddResourceForLayoutTest(
-        FilePath().AppendASCII("http").AppendASCII("tests"),
-        FilePath().AppendASCII("resources"));
-  }
 };
 
 // http://crbug.com/16934
 IN_PROC_BROWSER_TEST_F(WorkerHttpLayoutTest, DISABLED_Tests) {
   static const char* kLayoutTestFiles[] = {
       "shared-worker-importScripts.html",
       "shared-worker-redirect.html",
       "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",
   };
 
   for (size_t i = 0; i < arraysize(kLayoutTestFiles); ++i)
     RunHttpLayoutTest(kLayoutTestFiles[i]);
 }
 
 class WorkerXHRHttpLayoutTest : public InProcessBrowserLayoutTest {
  public:
   WorkerXHRHttpLayoutTest() : InProcessBrowserLayoutTest(
       FilePath().AppendASCII("http").AppendASCII("tests"),
       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
     "close.html",
 #endif
     // These tests (and the shared-worker versions below) are disabled due to
     // limitations in lighttpd (doesn't handle all of the HTTP methods).
     // "methods-async.html",
     // "methods.html",
 
@@ skipping 263 matching lines @@
 
   // First window has hit its limit. Now launch second window which creates
   // the same worker that was queued in the first window, to ensure it gets
   // connected to the first window too.
   query = StringPrintf("?id=%d", max_workers_per_tab);
   url = GetTestURL("single_shared_worker.html", query);
   content::NavigateToURL(CreateBrowser(), url);
 
   ASSERT_TRUE(WaitForWorkerProcessCount(max_workers_per_tab + 1));
 }