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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 8240006: Use a mocked compositor for unit tests (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: missed views_test_base.cc Created 9 years, 2 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 unified diff | Download patch | Annotate | Revision Log
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 'variables' : { 6 'variables' : {
7 'pyautolib_sources': [ 7 'pyautolib_sources': [
8 'app/chrome_command_ids.h', 8 'app/chrome_command_ids.h',
9 'app/chrome_dll_resource.h', 9 'app/chrome_dll_resource.h',
10 'common/automation_constants.h', 10 'common/automation_constants.h',
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
224 'test/test_navigation_observer.h', 224 'test/test_navigation_observer.h',
225 # TODO: these should live here but are currently used by 225 # TODO: these should live here but are currently used by
226 # production code code in libbrowser (in chrome.gyp). 226 # production code code in libbrowser (in chrome.gyp).
227 #'../content/browser/net/url_request_mock_http_job.cc', 227 #'../content/browser/net/url_request_mock_http_job.cc',
228 #'../content/browser/net/url_request_mock_http_job.h', 228 #'../content/browser/net/url_request_mock_http_job.h',
229 '../content/browser/ssl/ssl_client_auth_handler_mock.h', 229 '../content/browser/ssl/ssl_client_auth_handler_mock.h',
230 '../content/common/notification_observer_mock.cc', 230 '../content/common/notification_observer_mock.cc',
231 '../content/common/notification_observer_mock.h', 231 '../content/common/notification_observer_mock.h',
232 '../ui/gfx/image/image_unittest_util.h', 232 '../ui/gfx/image/image_unittest_util.h',
233 '../ui/gfx/image/image_unittest_util.cc', 233 '../ui/gfx/image/image_unittest_util.cc',
234 '../ui/gfx/compositor/compositor.cc',
235 '../ui/gfx/compositor/compositor.h',
236 '../ui/gfx/compositor/test_compositor.cc',
237 '../ui/gfx/compositor/test_compositor.h',
238 '../ui/gfx/compositor/test_texture.cc',
239 '../ui/gfx/compositor/test_texture.h',
jonathan.backer 2011/10/14 17:53:17 Shouldn't these be pulled in from a dep on composi
danakj 2011/10/14 19:51:39 Should it? It doesn't seem to be typical from what
234 '../webkit/quota/mock_quota_manager.cc', 240 '../webkit/quota/mock_quota_manager.cc',
235 '../webkit/quota/mock_quota_manager.h', 241 '../webkit/quota/mock_quota_manager.h',
236 ], 242 ],
237 'conditions': [ 243 'conditions': [
238 ['chromeos==0', { 244 ['chromeos==0', {
239 'sources/': [ 245 'sources/': [
240 ['exclude', '^browser/chromeos'], 246 ['exclude', '^browser/chromeos'],
241 ], 247 ],
242 }], 248 }],
249 ['views_compositor!=1', {
250 'sources!': [
251 '../ui/gfx/compositor/compositor.cc',
252 '../ui/gfx/compositor/compositor.h',
253 '../ui/gfx/compositor/test_compositor.cc',
254 '../ui/gfx/compositor/test_compositor.h',
255 '../ui/gfx/compositor/test_texture.cc',
256 '../ui/gfx/compositor/test_texture.h',
257 ],
258 }],
243 ['toolkit_uses_gtk == 1', { 259 ['toolkit_uses_gtk == 1', {
244 'dependencies': [ 260 'dependencies': [
245 '../build/linux/system.gyp:gtk', 261 '../build/linux/system.gyp:gtk',
246 '../build/linux/system.gyp:ssl', 262 '../build/linux/system.gyp:ssl',
247 ], 263 ],
248 }], 264 }],
249 ['OS=="win"', { 265 ['OS=="win"', {
250 'include_dirs': [ 266 'include_dirs': [
251 '<(DEPTH)/third_party/wtl/include', 267 '<(DEPTH)/third_party/wtl/include',
252 ], 268 ],
(...skipping 3830 matching lines...) Expand 10 before | Expand all | Expand 10 after
4083 # Use outputs of this action as inputs for the main target build. 4099 # Use outputs of this action as inputs for the main target build.
4084 # Seems as a misnomer but makes this happy on Linux (scons). 4100 # Seems as a misnomer but makes this happy on Linux (scons).
4085 'process_outputs_as_sources': 1, 4101 'process_outputs_as_sources': 1,
4086 }, 4102 },
4087 ], # 'actions' 4103 ], # 'actions'
4088 }, 4104 },
4089 ] 4105 ]
4090 }], # 'coverage!=0' 4106 }], # 'coverage!=0'
4091 ], # 'conditions' 4107 ], # 'conditions'
4092 } 4108 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698