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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_tests.gypi

Issue 7096013: Allow device policy code to be optionally included. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix try bot failures Created 9 years, 7 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 side-by-side diff with in-line comments
Download patch
« chrome/browser/policy/configuration_policy_pref_store.cc ('K') | « chrome/chrome_browser.gypi ('k') | chrome/test/testing_browser_process.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 497e83ca3b93eed4ceef0dbf225d5cce2a716972..4e6c7c2b4ec525a40f86538c77e792109368e9b3 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1500,6 +1500,7 @@
'browser/prefs/pref_model_associator_unittest.cc',
'browser/prefs/pref_notifier_impl_unittest.cc',
'browser/prefs/pref_service_unittest.cc',
+ 'browser/prefs/proxy_policy_unittest.cc',
'browser/prefs/pref_set_observer_unittest.cc',
'browser/prefs/pref_value_map_unittest.cc',
'browser/prefs/pref_value_store_unittest.cc',
@@ -1990,6 +1991,12 @@
['exclude', '^browser/ui/webui/chromeos/login/'],
],
}],
+ ['device_policy==0', {
+ 'sources/': [
+ ['exclude', '^browser/policy/'],
+ ['exclude', '^browser/prefs/proxy_policy_unittest.cc'],
+ ],
+ }],
['chromeos==1', {
'sources/': [
# TODO(thestig) Enable PrintPreviewUI tests on CrOS when
« chrome/browser/policy/configuration_policy_pref_store.cc ('K') | « chrome/chrome_browser.gypi ('k') | chrome/test/testing_browser_process.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698