chrome/browser/extensions/app_background_page_apitest.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/browser/extensions/app_background_page_apitest.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: try to fix android by restoring old path just for it 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

« no previous file with comments | « chrome/browser/extensions/api/webrtc_audio_private/webrtc_audio_private_browsertest.cc ('k') | chrome/browser/notifications/desktop_notifications_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/extensions/app_background_page_apitest.cc

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

--- chrome/browser/extensions/app_background_page_apitest.cc (revision 257432)

+++ chrome/browser/extensions/app_background_page_apitest.cc (working copy)

@@ -121,11 +121,7 @@

class AppBackgroundPageNaClTest : public AppBackgroundPageApiTest {

public:

AppBackgroundPageNaClTest()

- : extension_(NULL) {

- PathService::Get(chrome::DIR_GEN_TEST_DATA, &app_dir_);

- app_dir_ = app_dir_.AppendASCII(

- "ppapi/tests/extensions/background_keepalive/newlib");

- }

+ : extension_(NULL) {}

virtual ~AppBackgroundPageNaClTest() {

}

@@ -143,12 +139,15 @@

protected:

void LaunchTestingApp() {

- extension_ = LoadExtension(app_dir_);

+ base::FilePath app_dir;

+ PathService::Get(chrome::DIR_GEN_TEST_DATA, &app_dir);

+ app_dir = app_dir.AppendASCII(

+ "ppapi/tests/extensions/background_keepalive/newlib");

+ extension_ = LoadExtension(app_dir);

ASSERT_TRUE(extension_);

}

private:

- base::FilePath app_dir_;

const Extension* extension_;

};