Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(140)

Side by Side 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/test/ui/ui_test.cc ('k') | content/test/content_test_suite.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'targets': [ 6 'targets': [
7 { 7 {
8 'target_name': 'test_support_content', 8 'target_name': 'test_support_content',
9 'type': 'static_library', 9 'type': 'static_library',
10 'defines!': ['CONTENT_IMPLEMENTATION'], 10 'defines!': ['CONTENT_IMPLEMENTATION'],
11 'dependencies': [ 11 'dependencies': [
12 '../build/temp_gyp/googleurl.gyp:googleurl', 12 '../build/temp_gyp/googleurl.gyp:googleurl',
13 'content_browser', 13 'content_browser',
14 'content_common', 14 'content_common',
15 '../skia/skia.gyp:skia', 15 '../skia/skia.gyp:skia',
16 '../testing/gmock.gyp:gmock', 16 '../testing/gmock.gyp:gmock',
17 '../testing/gtest.gyp:gtest', 17 '../testing/gtest.gyp:gtest',
18 '../third_party/libvpx/libvpx.gyp:libvpx', 18 '../third_party/libvpx/libvpx.gyp:libvpx',
19 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', 19 '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
20 '../third_party/webrtc/modules/modules.gyp:video_capture_module', 20 '../third_party/webrtc/modules/modules.gyp:video_capture_module',
21 '../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system _wrappers', 21 '../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system _wrappers',
22 '../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core', 22 '../third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',
23 '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core', 23 '../third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
24 '../ui/gfx/compositor/compositor.gyp:test_compositor',
24 '../ui/gfx/surface/surface.gyp:surface', 25 '../ui/gfx/surface/surface.gyp:surface',
25 '../ui/ui.gyp:ui_test_support', 26 '../ui/ui.gyp:ui_test_support',
26 '../webkit/support/webkit_support.gyp:appcache', 27 '../webkit/support/webkit_support.gyp:appcache',
27 ], 28 ],
28 'include_dirs': [ 29 'include_dirs': [
29 '..', 30 '..',
30 ], 31 ],
31 'sources': [ 32 'sources': [
32 # TODO(phajdan.jr): All of those files should live in content/test. 33 # TODO(phajdan.jr): All of those files should live in content/test.
33 'browser/download/mock_download_file.cc', 34 'browser/download/mock_download_file.cc',
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
113 ['toolkit_uses_gtk == 1', { 114 ['toolkit_uses_gtk == 1', {
114 'dependencies': [ 115 'dependencies': [
115 '../build/linux/system.gyp:gtk', 116 '../build/linux/system.gyp:gtk',
116 ], 117 ],
117 }], 118 }],
118 ['use_glib == 1', { 119 ['use_glib == 1', {
119 'dependencies': [ 120 'dependencies': [
120 '../build/linux/system.gyp:glib', 121 '../build/linux/system.gyp:glib',
121 ], 122 ],
122 }], 123 }],
123 ['use_webkit_compositor==1', {
124 'dependencies': [
125 '../ui/gfx/compositor/compositor.gyp:compositor',
126 ],
127 }, {
128 'dependencies': [
129 '../ui/gfx/compositor/compositor.gyp:test_compositor',
130 ],
131 }],
132 ], 124 ],
133 }, 125 },
134 { 126 {
135 'target_name': 'content_unittests', 127 'target_name': 'content_unittests',
136 'type': 'executable', 128 'type': 'executable',
137 'defines!': ['CONTENT_IMPLEMENTATION'], 129 'defines!': ['CONTENT_IMPLEMENTATION'],
138 'dependencies': [ 130 'dependencies': [
139 'content_browser', 131 'content_browser',
140 'content_gpu', 132 'content_gpu',
141 'content_plugin', 133 'content_plugin',
(...skipping 272 matching lines...) Expand 10 before | Expand all | Expand 10 after
414 ], 406 ],
415 'sources': [ 407 'sources': [
416 'common/gpu/media/omx_video_decode_accelerator_unittest.cc', 408 'common/gpu/media/omx_video_decode_accelerator_unittest.cc',
417 ], 409 ],
418 } 410 }
419 ], 411 ],
420 }, 412 },
421 ], 413 ],
422 ], 414 ],
423 } 415 }
OLDNEW
« no previous file with comments | « chrome/test/ui/ui_test.cc ('k') | content/test/content_test_suite.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698