content/content_tests.gypi - Issue 208223006: Revert of Add creation of ServiceManager to Content

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/content_tests.gypi

Issue 208223006: Revert of Add creation of ServiceManager to Content (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: 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:

Index: content/content_tests.gypi

diff --git a/content/content_tests.gypi b/content/content_tests.gypi

index a1aa041c709297bfbe09b15c922cfd0e2840aaab..5fe67f865b0dd2f0e5c2b6c7e5e8cd0669ba4b56 100644

--- a/content/content_tests.gypi

+++ b/content/content_tests.gypi

@@ -970,7 +970,6 @@

'HAS_OUT_OF_PROC_TEST_RUNNER',

'sources': [

- 'app/mojo/mojo_browsertest.cc',

'browser/accessibility/accessibility_win_browsertest.cc',

'browser/accessibility/cross_platform_accessibility_browsertest.cc',

'browser/accessibility/dump_accessibility_tree_browsertest.cc',

@@ -1146,16 +1145,6 @@

['use_aura!=1 and OS!="mac"', {

'sources/': [

['exclude', '^browser/compositor/'],

- ],

- }],

- ['use_mojo==1', {

- 'dependencies': [

- '../mojo/mojo.gyp:mojo_environment_chromium',

- '../mojo/mojo.gyp:mojo_service_manager',

- ],

- },{

- 'sources!': [

- 'app/mojo/mojo_browsertest.cc',

}],

['OS!="android" and OS!="ios"', {

« no previous file with comments | « content/content_common.gypi ('k') | mojo/gles2/command_buffer_client_impl.cc » ('j') | no next file with comments »