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

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: cleanup 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 211 matching lines...) Expand 10 before | Expand all | Expand 10 after
222 'test/test_navigation_observer.h', 222 'test/test_navigation_observer.h',
223 # TODO: these should live here but are currently used by 223 # TODO: these should live here but are currently used by
224 # production code code in libbrowser (in chrome.gyp). 224 # production code code in libbrowser (in chrome.gyp).
225 #'../content/browser/net/url_request_mock_http_job.cc', 225 #'../content/browser/net/url_request_mock_http_job.cc',
226 #'../content/browser/net/url_request_mock_http_job.h', 226 #'../content/browser/net/url_request_mock_http_job.h',
227 '../content/browser/ssl/ssl_client_auth_handler_mock.h', 227 '../content/browser/ssl/ssl_client_auth_handler_mock.h',
228 '../content/common/notification_observer_mock.cc', 228 '../content/common/notification_observer_mock.cc',
229 '../content/common/notification_observer_mock.h', 229 '../content/common/notification_observer_mock.h',
230 '../ui/gfx/image/image_unittest_util.h', 230 '../ui/gfx/image/image_unittest_util.h',
231 '../ui/gfx/image/image_unittest_util.cc', 231 '../ui/gfx/image/image_unittest_util.cc',
232 '../ui/gfx/compositor/test_compositor.cc',
233 '../ui/gfx/compositor/test_compositor.h',
234 '../ui/gfx/compositor/test_texture.cc',
235 '../ui/gfx/compositor/test_texture.h',
236 '../views/widget/widget.h',
sky 2011/10/13 19:52:00 Ugh. I don't like pulling in widget here. How abou
danakj 2011/10/14 15:15:13 moved the factory methods to ui::Compositor instea
237 '../views/widget/widget.cc',
232 '../webkit/quota/mock_quota_manager.cc', 238 '../webkit/quota/mock_quota_manager.cc',
233 '../webkit/quota/mock_quota_manager.h', 239 '../webkit/quota/mock_quota_manager.h',
234 ], 240 ],
235 'conditions': [ 241 'conditions': [
236 ['chromeos==0', { 242 ['chromeos==0', {
237 'sources/': [ 243 'sources/': [
238 ['exclude', '^browser/chromeos'], 244 ['exclude', '^browser/chromeos'],
239 ], 245 ],
240 }], 246 }],
247 ['views_compositor!=1', {
248 'sources!': [
249 '../ui/gfx/compositor/test_compositor.cc',
250 '../ui/gfx/compositor/test_compositor.h',
251 '../ui/gfx/compositor/test_texture.cc',
252 '../ui/gfx/compositor/test_texture.h',
253 '../views/widget/widget.h',
254 '../views/widget/widget.cc',
255 ],
256 }],
241 ['toolkit_uses_gtk == 1', { 257 ['toolkit_uses_gtk == 1', {
242 'dependencies': [ 258 'dependencies': [
243 '../build/linux/system.gyp:gtk', 259 '../build/linux/system.gyp:gtk',
244 '../build/linux/system.gyp:ssl', 260 '../build/linux/system.gyp:ssl',
245 ], 261 ],
246 }], 262 }],
247 ['OS=="win"', { 263 ['OS=="win"', {
248 'include_dirs': [ 264 'include_dirs': [
249 '<(DEPTH)/third_party/wtl/include', 265 '<(DEPTH)/third_party/wtl/include',
250 ], 266 ],
(...skipping 3808 matching lines...) Expand 10 before | Expand all | Expand 10 after
4059 # Use outputs of this action as inputs for the main target build. 4075 # Use outputs of this action as inputs for the main target build.
4060 # Seems as a misnomer but makes this happy on Linux (scons). 4076 # Seems as a misnomer but makes this happy on Linux (scons).
4061 'process_outputs_as_sources': 1, 4077 'process_outputs_as_sources': 1,
4062 }, 4078 },
4063 ], # 'actions' 4079 ], # 'actions'
4064 }, 4080 },
4065 ] 4081 ]
4066 }], # 'coverage!=0' 4082 }], # 'coverage!=0'
4067 ], # 'conditions' 4083 ], # 'conditions'
4068 } 4084 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698