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

Side by Side Diff: chrome/chrome_tests_unit.gypi

Issue 533183002: Revert "Eliminate all code related to the AutomaticProfileResetter." (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase. Created 6 years, 3 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_ui.gypi ('k') | chrome/common/chrome_constants.h » ('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 '../apps/app_shim/app_shim_host_mac_unittest.cc', 7 '../apps/app_shim/app_shim_host_mac_unittest.cc',
8 '../apps/app_shim/extension_app_shim_handler_mac_unittest.cc', 8 '../apps/app_shim/extension_app_shim_handler_mac_unittest.cc',
9 '../apps/saved_files_service_unittest.cc', 9 '../apps/saved_files_service_unittest.cc',
10 '../components/autofill/content/renderer/test_password_autofill_agent.cc', 10 '../components/autofill/content/renderer/test_password_autofill_agent.cc',
(...skipping 2510 matching lines...) Expand 10 before | Expand all | Expand 10 after
2521 }, { # else: OS != "win" 2521 }, { # else: OS != "win"
2522 'sources!': [ 2522 'sources!': [
2523 'app/chrome_dll.rc', 2523 'app/chrome_dll.rc',
2524 'browser/search_engines/template_url_scraper_unittest.cc', 2524 'browser/search_engines/template_url_scraper_unittest.cc',
2525 'browser/ui/views/extensions/browser_action_drag_data_unittest.cc', 2525 'browser/ui/views/extensions/browser_action_drag_data_unittest.cc',
2526 'test/data/resource.rc', 2526 'test/data/resource.rc',
2527 '../skia/ext/vector_canvas_unittest.cc', 2527 '../skia/ext/vector_canvas_unittest.cc',
2528 ], 2528 ],
2529 }], 2529 }],
2530 ['OS!="android" and OS!="ios"', { 2530 ['OS!="android" and OS!="ios"', {
2531 'dependencies': [
2532 'tools/profile_reset/jtl_compiler.gyp:jtl_compiler_lib',
2533 ],
2531 'sources!': [ 2534 'sources!': [
2532 'browser/metrics/variations/variations_request_scheduler_mobile_unit test.cc', 2535 'browser/metrics/variations/variations_request_scheduler_mobile_unit test.cc',
2533 'browser/net/spdyproxy/data_reduction_proxy_settings_unittest.cc', 2536 'browser/net/spdyproxy/data_reduction_proxy_settings_unittest.cc',
2534 'browser/net/spdyproxy/data_reduction_proxy_settings_unittest.h', 2537 'browser/net/spdyproxy/data_reduction_proxy_settings_unittest.h',
2535 'browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc' , 2538 'browser/web_resource/promo_resource_service_mobile_ntp_unittest.cc' ,
2536 ], 2539 ],
2537 }], 2540 }],
2538 ['OS=="android"', { 2541 ['OS=="android"', {
2539 'dependencies!': [ 2542 'dependencies!': [
2540 '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput' , 2543 '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput' ,
(...skipping 340 matching lines...) Expand 10 before | Expand all | Expand 10 after
2881 'dependencies': [ 2884 'dependencies': [
2882 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 2885 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
2883 ], 2886 ],
2884 }], 2887 }],
2885 ], 2888 ],
2886 }, 2889 },
2887 ], 2890 ],
2888 }], 2891 }],
2889 ], # 'conditions' 2892 ], # 'conditions'
2890 } 2893 }
OLDNEW
« no previous file with comments | « chrome/chrome_browser_ui.gypi ('k') | chrome/common/chrome_constants.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698