content/test/content_browser_test.cc - Issue 10941011: Rewrite layout_browsertests to use content_shell --dump-render-tree to execute layout tests

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: content/test/content_browser_test.cc

Issue 10941011: Rewrite layout_browsertests to use content_shell --dump-render-tree to execute layout tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: updates Created 8 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« content/browser/worker_host/test/worker_browsertest.cc ('K') | « content/shell/webkit_test_runner_host.cc ('k') | content/test/layout_browsertest.h » ('j') | content/test/layout_browsertest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: content/test/content_browser_test.cc

diff --git a/content/test/content_browser_test.cc b/content/test/content_browser_test.cc

index a86569f9da975f76f6eccbc46fecf7a4322f3a1c..7173515261e24711953489d542228a26e8e0ccfe 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