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

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: Make changes requested by mnissler. 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
Index: chrome/chrome_tests.gypi
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 3779e635fdac011e2af4e7382e3c283c591ead7f..60e6383badedcf665a3e7ad8b415efa567c93f67 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1503,6 +1503,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',
Torne 2011/06/01 10:45:36 Add in alphabetical order
John Knottenbelt 2011/06/01 13:13:02 Done.
'browser/prefs/pref_set_observer_unittest.cc',
'browser/prefs/pref_value_map_unittest.cc',
'browser/prefs/pref_value_store_unittest.cc',
@@ -1994,6 +1995,12 @@
['exclude', '^browser/ui/webui/chromeos/login/'],
],
}],
+ ['configuration_policy==0', {
+ 'sources/': [
+ ['exclude', '^browser/policy/'],
+ ['exclude', '^browser/prefs/proxy_policy_unittest.cc'],
+ ],
+ }],
['chromeos==1', {
'sources/': [
# TODO(thestig) Enable PrintPreviewUI tests on CrOS when

Powered by Google App Engine
This is Rietveld 408576698