diff options
| author | rniwa@chromium.org <rniwa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-14 08:06:18 +0000 |
|---|---|---|
| committer | rniwa@chromium.org <rniwa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-14 08:06:18 +0000 |
| commit | de09a7955b2fb58e9c9c0654570e935c722a1fc1 (patch) | |
| tree | d45f44714ba0cf81f02a70506f5a9e9d7a85c86a /content | |
| parent | 829a8987b88af6305af31c1a544f1fa1f9b5dbc4 (diff) | |
| download | chromium_src-de09a7955b2fb58e9c9c0654570e935c722a1fc1.zip chromium_src-de09a7955b2fb58e9c9c0654570e935c722a1fc1.tar.gz chromium_src-de09a7955b2fb58e9c9c0654570e935c722a1fc1.tar.bz2 | |
Expose layoutTestController as testRunner. We really need to reduce the number of layoutTestController implementations.
Having three of them just in the Chromium repository is a maintenance nightmare.
BUG=132672
TEST=WorkerXHRHttpLayoutTest.Tests
TBR=darin@chromium.org, tony@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142110 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
| -rw-r--r-- | content/browser/worker_host/test/worker_browsertest.cc | 3 | ||||
| -rw-r--r-- | content/shell/layout_test_controller.js | 4 | ||||
| -rw-r--r-- | content/test/layout_browsertest.cc | 1 |
3 files changed, 6 insertions, 2 deletions
diff --git a/content/browser/worker_host/test/worker_browsertest.cc b/content/browser/worker_host/test/worker_browsertest.cc index a9c1ef5..c838dae 100644 --- a/content/browser/worker_host/test/worker_browsertest.cc +++ b/content/browser/worker_host/test/worker_browsertest.cc @@ -212,8 +212,7 @@ class WorkerXHRHttpLayoutTest : public InProcessBrowserLayoutTest { } }; -// Disabled: http://crbug.com/132672 -IN_PROC_BROWSER_TEST_F(WorkerXHRHttpLayoutTest, DISABLED_Tests) { +IN_PROC_BROWSER_TEST_F(WorkerXHRHttpLayoutTest, Tests) { static const char* kLayoutTestFiles[] = { "abort-exception-assert.html", #if defined(OS_WIN) diff --git a/content/shell/layout_test_controller.js b/content/shell/layout_test_controller.js index 5cab912..1ace50c 100644 --- a/content/shell/layout_test_controller.js +++ b/content/shell/layout_test_controller.js @@ -3,6 +3,7 @@ // found in the LICENSE file. var layoutTestController = layoutTestController || {}; +var testRunner = testRunner || {}; (function() { native function NotifyDone(); @@ -21,4 +22,7 @@ var layoutTestController = layoutTestController || {}; SetShouldStayOnPageAfterHandlingBeforeUnload; this.waitUntilDone = SetWaitUntilDone; }(); + + testRunner = layoutTestController; + })(); diff --git a/content/test/layout_browsertest.cc b/content/test/layout_browsertest.cc index 1d23291..70468bf 100644 --- a/content/test/layout_browsertest.cc +++ b/content/test/layout_browsertest.cc @@ -84,6 +84,7 @@ static const std::string preamble = " this.workerThreadCount = 0; \n" "}\n" "window.layoutTestController = new LayoutTestController();\n" + "window.testRunner = window.layoutTestController;\n" "window.addEventListener('load', layoutTestController.OnEvent, false);\n" "</script>"; |