diff options
| author | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 15:20:04 +0000 |
|---|---|---|
| committer | jochen@chromium.org <jochen@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-26 15:20:04 +0000 |
| commit | 118310616de7a8a6344aa46a7596b542e2329605 (patch) | |
| tree | 1848c6689bc1ec2c19969e7bc906904b37bf7551 /content/test/content_browser_test.cc | |
| parent | a55be12bd48805850f2a3404af9116b09b1c4ebb (diff) | |
| download | chromium_src-118310616de7a8a6344aa46a7596b542e2329605.zip chromium_src-118310616de7a8a6344aa46a7596b542e2329605.tar.gz chromium_src-118310616de7a8a6344aa46a7596b542e2329605.tar.bz2 | |
Rewrite layout_browsertests to use content_shell --dump-render-tree to execute layout tests
break down of changes
- refactor WebKitTestResultPrinter to print to a stream
- allow for swapping the result printer
- add testRunner.workerThreadCount implementation and testRunner.overridePreference stub
- rip out the fake testRunner and result getting / formatting code from InProcessBrowserLayoutTest
- make it use WebKitTestController to run the tests
- remove all the code for copying resources around (since we don't need to patch the tests, we can just read the original)
BUG=none
TEST=layout_browsertests passes
Review URL: https://chromiumcodereview.appspot.com/10941011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@158803 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/test/content_browser_test.cc')
| -rw-r--r-- | content/test/content_browser_test.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/content/test/content_browser_test.cc b/content/test/content_browser_test.cc index a86569f..7173515 100644 --- a/content/test/content_browser_test.cc +++ b/content/test/content_browser_test.cc @@ -93,8 +93,10 @@ void ContentBrowserTest::TearDown() { } void ContentBrowserTest::RunTestOnMainThreadLoop() { - CHECK_EQ(Shell::windows().size(), 1u); - shell_ = Shell::windows()[0]; + if (!CommandLine::ForCurrentProcess()->HasSwitch(switches::kDumpRenderTree)) { + CHECK_EQ(Shell::windows().size(), 1u); + shell_ = Shell::windows()[0]; + } #if defined(OS_MACOSX) // On Mac, without the following autorelease pool, code which is directly |