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

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 torne. 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
« no previous file with comments | « 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 3779e635fdac011e2af4e7382e3c283c591ead7f..77fa339ebd77cf4a9ff0b1533a0cd5221d49edc3 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -1507,6 +1507,7 @@
'browser/prefs/pref_value_map_unittest.cc',
'browser/prefs/pref_value_store_unittest.cc',
'browser/prefs/proxy_config_dictionary_unittest.cc',
+ 'browser/prefs/proxy_policy_unittest.cc',
'browser/prefs/proxy_prefs_unittest.cc',
'browser/prefs/scoped_user_pref_update_unittest.cc',
'browser/prefs/session_startup_pref_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
« no previous file with comments | « 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