chrome/test/nacl/nacl_browsertest_util.cc - Issue 190663012: Run ContentMain in a browser_test's browser process. This removes duplication of code in the browse…

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/nacl/nacl_browsertest_util.cc

Issue 190663012: Run ContentMain in a browser_test's browser process. This removes duplication of code in the browse… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: cleanup Created 6 years, 9 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

« chrome/browser/ui/views/menu_item_view_interactive_uitest.cc ('K') | « chrome/test/nacl/nacl_browsertest_util.h ('k') | chrome/test/ppapi/ppapi_test.h » ('j') | content/public/app/content_main.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/test/nacl/nacl_browsertest_util.cc

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

--- chrome/test/nacl/nacl_browsertest_util.cc (revision 257128)

+++ chrome/test/nacl/nacl_browsertest_util.cc (working copy)

@@ -206,7 +206,7 @@

command_line->AppendSwitch(switches::kEnableNaCl);

}

-void NaClBrowserTestBase::SetUpInProcessBrowserTestFixture() {

+void NaClBrowserTestBase::SetUpOnMainThread() {

// Sanity check.

base::FilePath plugin_lib;

ASSERT_TRUE(PathService::Get(chrome::FILE_NACL_PLUGIN, &plugin_lib));