content/content_tests.gypi - Issue 8873037: Revert 113676 - Attempt 2 at : Makes tests either use mock compositor or mock

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 8873037: Revert 113676 - Attempt 2 at : Makes tests either use mock compositor or mock (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

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

Index: content/content_tests.gypi

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

--- content/content_tests.gypi (revision 113682)

+++ content/content_tests.gypi (working copy)

@@ -21,6 +21,7 @@

'../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',

'../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',

'../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',

+ '../ui/gfx/compositor/compositor.gyp:test_compositor',

'../ui/gfx/surface/surface.gyp:surface',

'../ui/ui.gyp:ui_test_support',

'../webkit/support/webkit_support.gyp:appcache',

@@ -120,15 +121,6 @@

'../build/linux/system.gyp:glib',

}],

- ['use_webkit_compositor==1', {

- 'dependencies': [

- '../ui/gfx/compositor/compositor.gyp:compositor',

- ],

- }, {

- 'dependencies': [

- '../ui/gfx/compositor/compositor.gyp:test_compositor',

- ],

- }],

{

« no previous file with comments | « chrome/test/ui/ui_test.cc ('k') | content/test/content_test_suite.cc » ('j') | no next file with comments »