chrome/test/base/in_process_browser_test.cc - Issue 10820007: Move all the layout tests that ran under browser_tests to run under content_browsertests.

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: chrome/test/base/in_process_browser_test.cc

Issue 10820007: Move all the layout tests that ran under browser_tests to run under content_browsertests. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: fix mac Created 8 years, 5 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

« ash/shell/content_client/shell_browser_main_parts.cc ('K') | « chrome/test/base/in_process_browser_test.h ('k') | chrome/test/base/layout_test_http_server.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/base/in_process_browser_test.cc

===================================================================

--- chrome/test/base/in_process_browser_test.cc (revision 148205)

+++ chrome/test/base/in_process_browser_test.cc (working copy)

@@ -78,11 +78,7 @@

chrome_path = chrome_path.Append(chrome::kBrowserProcessExecutablePath);

CHECK(PathService::Override(base::FILE_EXE, chrome_path));

#endif // defined(OS_MACOSX)

- test_server_.reset(new net::TestServer(

- net::TestServer::TYPE_HTTP,

- net::TestServer::kLocalhost,

- FilePath(FILE_PATH_LITERAL("chrome/test/data"))));

+ CreateTestServer("chrome/test/data");

}

InProcessBrowserTest::~InProcessBrowserTest() {

@@ -156,8 +152,6 @@

// Propagate commandline settings from test_launcher_utils.

test_launcher_utils::PrepareBrowserCommandLineForTests(command_line);

- command_line->AppendSwitch(switches::kDomAutomationController);

// This is a Browser test.

command_line->AppendSwitchASCII(switches::kTestType, kBrowserTestType);