diff options
| author | rniwa@chromium.org <rniwa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-14 03:52:32 +0000 |
|---|---|---|
| committer | rniwa@chromium.org <rniwa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-06-14 03:52:32 +0000 |
| commit | 95adbf3478be1c66a64e625142499c890052dc6e (patch) | |
| tree | da3284741197b2b6d26b12309755d185c364a65f /content | |
| parent | 73dab1b667e969313caddc2664799839fd6c7d1e (diff) | |
| download | chromium_src-95adbf3478be1c66a64e625142499c890052dc6e.zip chromium_src-95adbf3478be1c66a64e625142499c890052dc6e.tar.gz chromium_src-95adbf3478be1c66a64e625142499c890052dc6e.tar.bz2 | |
Expose layoutTestController as testRunner.
BUG=132672
TEST=WorkerXHRHttpLayoutTest.Tests
TBR=darin@chromium.org
Review URL: https://chromiumcodereview.appspot.com/10541160
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@142087 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 | 3 |
2 files changed, 4 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..fee881b 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,6 @@ var layoutTestController = layoutTestController || {}; SetShouldStayOnPageAfterHandlingBeforeUnload; this.waitUntilDone = SetWaitUntilDone; }(); + + testRunner = layoutTestController; })(); |