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

Unified Diff: chrome/chrome_tests_unit.gypi

Issue 11826059: Add ManagedUserService for profile-specific managed user data. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: win fix Created 7 years, 11 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_unit.gypi
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 11a2cf10647480844328bda397c06126f423324f..14ce702790752ce9bcdb64bbbe22ee64d250ef9d 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -837,6 +837,7 @@
'browser/mac/keystone_glue_unittest.mm',
'browser/managed_mode/managed_mode_unittest.cc',
'browser/managed_mode/managed_mode_url_filter_unittest.cc',
+ 'browser/managed_mode/managed_user_service_unittest.cc',
'browser/media/media_internals_unittest.cc',
'browser/media_gallery/media_file_system_registry_unittest.cc',
'browser/media_gallery/media_galleries_dialog_controller_mock.cc',
@@ -1804,7 +1805,6 @@
['configuration_policy==0', {
'sources!': [
'browser/extensions/api/storage/policy_value_store_unittest.cc',
- 'browser/managed_mode/managed_mode_url_filter_unittest.cc',
'browser/prefs/proxy_policy_unittest.cc',
'browser/ui/webui/policy_ui_unittest.cc',
],
@@ -2114,8 +2114,6 @@
'browser/browser_commands_unittest.cc',
'browser/download/download_shelf_unittest.cc',
- 'browser/managed_mode/managed_mode_unittest.cc',
- 'browser/managed_mode/managed_mode_url_filter_unittest.cc',
'browser/net/gaia/gaia_oauth_fetcher_unittest.cc',
'browser/page_cycler/page_cycler_unittest.cc',
'browser/profiles/off_the_record_profile_impl_unittest.cc',
@@ -2244,6 +2242,11 @@
['use_official_google_api_keys==1', {
'defines': ['USE_OFFICIAL_GOOGLE_API_KEYS=1'],
}],
+ ['enable_managed_users!=1', {
+ 'sources/': [
+ ['exclude', '^browser/managed_mode/'],
+ ],
+ }],
],
'target_conditions': [
['OS == "ios"', {

Powered by Google App Engine
This is Rietveld 408576698