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

Side by Side Diff: chrome/chrome_tests_unit.gypi

Issue 1221033002: Add proxy_config component (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update copyrights Created 5 years, 5 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
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | components/BUILD.gn » ('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 2012 The Chromium Authors. All rights reserved. 1 # Copyright 2012 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 'variables': { 5 'variables': {
6 'chrome_unit_tests_sources': [ 6 'chrome_unit_tests_sources': [
7 # histograms.xml is analyzed by AboutFlagsHistogramTest, so this 7 # histograms.xml is analyzed by AboutFlagsHistogramTest, so this
8 # dependency is needed to make commit bots run unit_tests on 8 # dependency is needed to make commit bots run unit_tests on
9 # histograms.xml changes. 9 # histograms.xml changes.
10 '../tools/metrics/histograms/histograms.xml', 10 '../tools/metrics/histograms/histograms.xml',
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 'browser/predictors/resource_prefetch_predictor_tables_unittest.cc', 176 'browser/predictors/resource_prefetch_predictor_tables_unittest.cc',
177 'browser/predictors/resource_prefetch_predictor_unittest.cc', 177 'browser/predictors/resource_prefetch_predictor_unittest.cc',
178 'browser/predictors/resource_prefetcher_unittest.cc', 178 'browser/predictors/resource_prefetcher_unittest.cc',
179 'browser/prefs/chrome_pref_service_unittest.cc', 179 'browser/prefs/chrome_pref_service_unittest.cc',
180 'browser/prefs/command_line_pref_store_unittest.cc', 180 'browser/prefs/command_line_pref_store_unittest.cc',
181 'browser/prefs/incognito_mode_prefs_unittest.cc', 181 'browser/prefs/incognito_mode_prefs_unittest.cc',
182 'browser/prefs/leveldb_pref_store_unittest.cc', 182 'browser/prefs/leveldb_pref_store_unittest.cc',
183 'browser/prefs/pref_model_associator_unittest.cc', 183 'browser/prefs/pref_model_associator_unittest.cc',
184 'browser/prefs/prefs_syncable_service_unittest.cc', 184 'browser/prefs/prefs_syncable_service_unittest.cc',
185 'browser/prefs/profile_pref_store_manager_unittest.cc', 185 'browser/prefs/profile_pref_store_manager_unittest.cc',
186 'browser/prefs/proxy_config_dictionary_unittest.cc',
187 'browser/prefs/proxy_prefs_unittest.cc',
188 'browser/prefs/session_startup_pref_unittest.cc', 186 'browser/prefs/session_startup_pref_unittest.cc',
189 'browser/prefs/tracked/device_id_unittest.cc', 187 'browser/prefs/tracked/device_id_unittest.cc',
190 'browser/prefs/tracked/mock_validation_delegate.cc', 188 'browser/prefs/tracked/mock_validation_delegate.cc',
191 'browser/prefs/tracked/mock_validation_delegate.h', 189 'browser/prefs/tracked/mock_validation_delegate.h',
192 'browser/prefs/tracked/pref_hash_calculator_unittest.cc', 190 'browser/prefs/tracked/pref_hash_calculator_unittest.cc',
193 'browser/prefs/tracked/pref_hash_filter_unittest.cc', 191 'browser/prefs/tracked/pref_hash_filter_unittest.cc',
194 'browser/prefs/tracked/pref_hash_store_impl_unittest.cc', 192 'browser/prefs/tracked/pref_hash_store_impl_unittest.cc',
195 'browser/prefs/tracked/pref_service_hash_store_contents_unittest.cc', 193 'browser/prefs/tracked/pref_service_hash_store_contents_unittest.cc',
196 'browser/prefs/tracked/segregated_pref_store_unittest.cc', 194 'browser/prefs/tracked/segregated_pref_store_unittest.cc',
197 'browser/prefs/tracked/tracked_preferences_migration_unittest.cc', 195 'browser/prefs/tracked/tracked_preferences_migration_unittest.cc',
(...skipping 2322 matching lines...) Expand 10 before | Expand all | Expand 10 after
2520 ['OS=="mac"', { 2518 ['OS=="mac"', {
2521 # The test fetches resources which means Mac need the app bundle to 2519 # The test fetches resources which means Mac need the app bundle to
2522 # exist on disk so it can pull from it. 2520 # exist on disk so it can pull from it.
2523 'dependencies': [ 2521 'dependencies': [
2524 '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:go ogle_toolbox_for_mac', 2522 '../third_party/google_toolbox_for_mac/google_toolbox_for_mac.gyp:go ogle_toolbox_for_mac',
2525 '../third_party/ocmock/ocmock.gyp:ocmock', 2523 '../third_party/ocmock/ocmock.gyp:ocmock',
2526 'chrome', 2524 'chrome',
2527 ], 2525 ],
2528 'sources': [ '<@(chrome_unit_tests_mac_sources)' ], 2526 'sources': [ '<@(chrome_unit_tests_mac_sources)' ],
2529 'sources!': [ 2527 'sources!': [
2528 # This tests the function GetSpellCheckLanguages which is not used
2529 # on Mac.
2530 'browser/spellchecker/spellcheck_service_unittest.cc',
2530 'browser/ui/tests/ui_gfx_image_unittest.cc', 2531 'browser/ui/tests/ui_gfx_image_unittest.cc',
2531 'renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc', 2532 'renderer/spellchecker/spellcheck_provider_hunspell_unittest.cc',
2532 'tools/convert_dict/convert_dict_unittest.cc', 2533 'tools/convert_dict/convert_dict_unittest.cc',
2533 # This tests the function GetSpellCheckLanguages which is not used
2534 # on Mac.
2535 'browser/spellchecker/spellcheck_service_unittest.cc',
2536 ], 2534 ],
2537 # TODO(mark): We really want this for all non-static library targets, 2535 # TODO(mark): We really want this for all non-static library targets,
2538 # but when we tried to pull it up to the common.gypi level, it broke 2536 # but when we tried to pull it up to the common.gypi level, it broke
2539 # other things like the ui and startup tests. *shrug* 2537 # other things like the ui and startup tests. *shrug*
2540 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, 2538 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
2541 }], 2539 }],
2542 ['OS!="mac" and OS!="ios"', { 2540 ['OS!="mac" and OS!="ios"', {
2543 'dependencies': [ 2541 'dependencies': [
2544 '../third_party/hunspell/hunspell.gyp:hunspell', 2542 '../third_party/hunspell/hunspell.gyp:hunspell',
2545 'chrome_resources.gyp:packed_extra_resources', 2543 'chrome_resources.gyp:packed_extra_resources',
(...skipping 336 matching lines...) Expand 10 before | Expand all | Expand 10 after
2882 'dependencies': [ 2880 'dependencies': [
2883 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2881 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2884 ], 2882 ],
2885 }], 2883 }],
2886 ], 2884 ],
2887 }, 2885 },
2888 ], 2886 ],
2889 }], 2887 }],
2890 ], # 'conditions' 2888 ], # 'conditions'
2891 } 2889 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser.gypi ('k') | components/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698