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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 1829703002: Add ArcEnabled policy implementation (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed test and removed all changes from arc_auth_service Created 4 years, 9 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
OLDNEW
1 # Copyright 2013 The Chromium Authors. All rights reserved. 1 # Copyright 2013 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 'build_angle_deqp_tests%': 0, 6 'build_angle_deqp_tests%': 0,
7 'chrome_browser_extensions_test_support_sources': [ 7 'chrome_browser_extensions_test_support_sources': [
8 # A list of sources which is shared between different browser tests. 8 # A list of sources which is shared between different browser tests.
9 'browser/apps/app_browsertest_util.cc', 9 'browser/apps/app_browsertest_util.cc',
10 'browser/apps/app_browsertest_util.h', 10 'browser/apps/app_browsertest_util.h',
(...skipping 2242 matching lines...) Expand 10 before | Expand all | Expand 10 after
2253 'conditions': [ 2253 'conditions': [
2254 ['incremental_chrome_dll==1', { 2254 ['incremental_chrome_dll==1', {
2255 'UseLibraryDependencyInputs': "true", 2255 'UseLibraryDependencyInputs': "true",
2256 }], 2256 }],
2257 ], 2257 ],
2258 }, 2258 },
2259 }, 2259 },
2260 'conditions': [ 2260 'conditions': [
2261 ['chromeos==1', { 2261 ['chromeos==1', {
2262 'dependencies': [ 2262 'dependencies': [
2263 '../components/components.gyp:arc_test_support',
2263 '../third_party/boringssl/boringssl.gyp:boringssl', 2264 '../third_party/boringssl/boringssl.gyp:boringssl',
2264 ] 2265 ]
2265 }, { 2266 }, {
2266 'conditions': [ 2267 'conditions': [
2267 ['OS == "linux" or OS == "win"', { 2268 ['OS == "linux" or OS == "win"', {
2268 'sources': [ 2269 'sources': [
2269 'browser/ui/views/ime/ime_window_browsertest.cc', 2270 'browser/ui/views/ime/ime_window_browsertest.cc',
2270 ], 2271 ],
2271 }] 2272 }]
2272 ] 2273 ]
(...skipping 1268 matching lines...) Expand 10 before | Expand all | Expand 10 after
3541 'browser', 3542 'browser',
3542 ], 3543 ],
3543 'sources': [ 3544 'sources': [
3544 'tools/service_discovery_sniffer/service_discovery_sniffer.cc', 3545 'tools/service_discovery_sniffer/service_discovery_sniffer.cc',
3545 'tools/service_discovery_sniffer/service_discovery_sniffer.h', 3546 'tools/service_discovery_sniffer/service_discovery_sniffer.h',
3546 ], 3547 ],
3547 }] 3548 }]
3548 }], 3549 }],
3549 ], # 'conditions' 3550 ], # 'conditions'
3550 } 3551 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698