Revert of Remove configuration policy from chrome build files.

chrome/chrome_tests_unit.gypi

 # Copyright 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 {
   'variables': {
     'chrome_unit_tests_sources': [
       # histograms.xml is analyzed by AboutFlagsHistogramTest, so this
       # dependency is needed to make commit bots run unit_tests on
       # histograms.xml changes.
       '../tools/metrics/histograms/histograms.xml',
@@ skipping 149 matching lines @@
       'browser/password_manager/chrome_password_manager_client_unittest.cc',
       'browser/password_manager/password_manager_internals_service_unittest.cc',
       'browser/password_manager/password_store_mac_unittest.cc',
       'browser/password_manager/password_store_proxy_mac_unittest.cc',
       'browser/password_manager/password_store_win_unittest.cc',
       'browser/password_manager/password_store_x_unittest.cc',
       'browser/password_manager/simple_password_store_mac_unittest.cc',
       'browser/permissions/chooser_context_base_unittest.cc',
       'browser/permissions/permission_context_base_unittest.cc',
       'browser/permissions/permission_manager_unittest.cc',
-      'browser/policy/cloud/cloud_policy_invalidator_unittest.cc',
-      'browser/policy/cloud/remote_commands_invalidator_unittest.cc',
-      'browser/policy/cloud/user_policy_signin_service_unittest.cc',
-      'browser/policy/file_selection_dialogs_policy_handler_unittest.cc',
-      'browser/policy/javascript_policy_handler_unittest.cc',
-      'browser/policy/managed_bookmarks_policy_handler_unittest.cc',
-      'browser/policy/policy_path_parser_unittest.cc',
-      'browser/policy/profile_policy_connector_unittest.cc',
       'browser/predictors/autocomplete_action_predictor_table_unittest.cc',
       'browser/predictors/autocomplete_action_predictor_unittest.cc',
       'browser/predictors/resource_prefetch_common_unittest.cc',
       'browser/predictors/resource_prefetch_predictor_tables_unittest.cc',
       'browser/predictors/resource_prefetch_predictor_unittest.cc',
       'browser/predictors/resource_prefetcher_unittest.cc',
       'browser/prefs/chrome_pref_service_unittest.cc',
       'browser/prefs/command_line_pref_store_proxy_unittest.cc',
       'browser/prefs/command_line_pref_store_ssl_manager_unittest.cc',
       'browser/prefs/command_line_pref_store_unittest.cc',
       'browser/prefs/incognito_mode_prefs_unittest.cc',
-      'browser/prefs/proxy_policy_unittest.cc',
       'browser/prefs/profile_pref_store_manager_unittest.cc',
       'browser/prefs/session_startup_pref_unittest.cc',
       'browser/prerender/prerender_history_unittest.cc',
       'browser/prerender/prerender_resource_throttle_unittest.cc',
       'browser/prerender/prerender_unittest.cc',
       'browser/prerender/prerender_util_unittest.cc',
       'browser/private_working_set_snapshot_win_unittest.cc',
       'browser/process_info_snapshot_mac_unittest.cc',
       'browser/process_singleton_win_unittest.cc',
       'browser/profiles/gaia_info_update_service_unittest.cc',
-      'browser/profiles/incognito_mode_policy_handler_unittest.cc',
       'browser/profiles/profile_attributes_storage_unittest.cc',
       'browser/profiles/profile_avatar_icon_util_unittest.cc',
       'browser/profiles/profile_downloader_unittest.cc',
       'browser/profiles/profile_info_cache_unittest.cc',
       'browser/profiles/profile_info_cache_unittest.h',
       'browser/profiles/profile_manager_unittest.cc',
       'browser/profiles/profile_shortcut_manager_unittest_win.cc',
       'browser/push_messaging/push_messaging_app_identifier_unittest.cc',
       'browser/push_messaging/push_messaging_notification_manager_unittest.cc',
       'browser/push_messaging/push_messaging_permission_context_unittest.cc',
@@ skipping 10 matching lines @@
       'browser/search_engines/template_url_fetcher_unittest.cc',
       'browser/search_engines/template_url_parser_unittest.cc',
       'browser/search_engines/template_url_service_sync_unittest.cc',
       'browser/search_engines/template_url_service_unittest.cc',
 
       'browser/service_process/service_process_control_mac_unittest.mm',
       'browser/services/gcm/fake_gcm_profile_service.cc',
       'browser/services/gcm/fake_gcm_profile_service.h',
       'browser/services/gcm/fake_signin_manager.cc',
       'browser/services/gcm/fake_signin_manager.h',
-      'browser/sessions/restore_on_startup_policy_handler_unittest.cc',
       'browser/shell_integration_win_unittest.cc',
       'browser/signin/account_reconcilor_unittest.cc',
       'browser/signin/chrome_signin_client_unittest.cc',
       'browser/signin/chrome_signin_status_metrics_provider_delegate_unittest.cc',
       'browser/signin/local_auth_unittest.cc',
       'browser/signin/signin_manager_unittest.cc',
       'browser/signin/signin_status_metrics_provider_chromeos_unittest.cc',
       'browser/signin/signin_tracker_unittest.cc',
       'browser/signin/test_signin_client_builder.cc',
       'browser/ssl/ssl_error_handler_unittest.cc',
@@ skipping 92 matching lines @@
     ],
     'chrome_unit_tests_mac_android_sources': [
       'browser/password_manager/save_password_infobar_delegate_unittest.cc',
     ],
     'chrome_unit_tests_android_sources': [
       'browser/autofill/autofill_save_card_infobar_delegate_mobile_unittest.cc',
       'browser/password_manager/auto_signin_first_run_dialog_android_unittest.cc',
       'browser/permissions/permission_queue_controller_unittest.cc',
     ],
     'chrome_unit_tests_non_mobile_sources': [
-      'browser/download/download_dir_policy_handler_unittest.cc',
       'browser/lifetime/keep_alive_registry_unittest.cc',
       'browser/renderer_context_menu/render_view_context_menu_test_util.cc',
       'browser/renderer_context_menu/render_view_context_menu_test_util.h',
       'browser/ui/autofill/save_card_bubble_controller_impl_unittest.cc',
       'browser/ui/passwords/manage_passwords_ui_controller_unittest.cc',
       'browser/ui/website_settings/mock_permission_bubble_factory.cc',
       'browser/ui/website_settings/mock_permission_bubble_factory.h',
       'browser/ui/website_settings/mock_permission_bubble_view.cc',
       'browser/ui/website_settings/mock_permission_bubble_view.h',
     ],
@@ skipping 96 matching lines @@
       'browser/extensions/api/proxy/proxy_api_helpers_unittest.cc',
       'browser/extensions/api/signed_in_devices/id_mapping_helper_unittest.cc',
       'browser/extensions/api/signed_in_devices/signed_in_devices_api_unittest.cc',
       'browser/extensions/api/signed_in_devices/signed_in_devices_manager_unittest.cc',
       'browser/extensions/api/socket/combined_socket_unittest.cc',
       'browser/extensions/api/socket/socket_api_unittest.cc',
       'browser/extensions/api/socket/tcp_socket_unittest.cc',
       'browser/extensions/api/socket/tls_socket_unittest.cc',
       'browser/extensions/api/socket/udp_socket_unittest.cc',
       'browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc',
-      'browser/extensions/api/storage/policy_value_store_unittest.cc',
       'browser/extensions/api/storage/settings_sync_unittest.cc',
       'browser/extensions/api/streams_private/streams_private_manifest_unittest.cc',
       'browser/extensions/api/tabs/tabs_api_unittest.cc',
       'browser/extensions/api/web_navigation/frame_navigation_state_unittest.cc',
       'browser/extensions/api/web_request/web_request_api_unittest.cc',
       'browser/extensions/api/web_request/web_request_permissions_unittest.cc',
       'browser/extensions/app_data_migrator_unittest.cc',
       'browser/extensions/blacklist_state_fetcher_unittest.cc',
       'browser/extensions/bookmark_app_helper_unittest.cc',
       'browser/extensions/chrome_app_sorting_unittest.cc',
@@ skipping 50 matching lines @@
       'browser/extensions/external_provider_impl_unittest.cc',
       'browser/extensions/favicon_downloader_unittest.cc',
       'browser/extensions/install_tracker_unittest.cc',
       'browser/extensions/location_bar_controller_unittest.cc',
       'browser/extensions/menu_manager_unittest.cc',
       'browser/extensions/pack_extension_unittest.cc',
       'browser/extensions/permission_message_combinations_unittest.cc',
       'browser/extensions/permission_messages_unittest.cc',
       'browser/extensions/permissions_based_management_policy_provider_unittest.cc',
       'browser/extensions/permissions_updater_unittest.cc',
-      'browser/extensions/policy_handlers_unittest.cc',
       'browser/extensions/scripting_permissions_modifier_unittest.cc',
       'browser/extensions/shared_module_service_unittest.cc',
       'browser/extensions/standard_management_policy_provider_unittest.cc',
       'browser/extensions/token_cache/token_cache_service_unittest.cc',
       'browser/extensions/updater/extension_cache_fake.cc',
       'browser/extensions/updater/extension_cache_fake.h',
       'browser/extensions/updater/extension_updater_unittest.cc',
       'browser/extensions/user_script_listener_unittest.cc',
       'browser/extensions/warning_badge_service_unittest.cc',
       'browser/extensions/webstore_inline_installer_unittest.cc',
@@ skipping 182 matching lines @@
     'chrome_unit_tests_service_discovery_sources': [
       'browser/devtools/device/cast_device_provider_unittest.cc',
       'browser/local_discovery/service_discovery_client_mac_unittest.mm',
       'browser/printing/cloud_print/cloud_print_printer_list_unittest.cc',
       'browser/printing/cloud_print/gcd_api_flow_unittest.cc',
       'browser/printing/cloud_print/privet_confirm_api_flow_unittest.cc',
       'browser/printing/cloud_print/privet_http_unittest.cc',
       'browser/printing/cloud_print/privet_notifications_unittest.cc',
       'browser/printing/cloud_print/privet_url_fetcher_unittest.cc',
     ],
+    'chrome_unit_tests_configuration_policy_sources': [
+      'browser/policy/cloud/cloud_policy_invalidator_unittest.cc',
+      'browser/policy/cloud/remote_commands_invalidator_unittest.cc',
+      'browser/policy/cloud/user_policy_signin_service_unittest.cc',
+      'browser/policy/file_selection_dialogs_policy_handler_unittest.cc',
+      'browser/policy/javascript_policy_handler_unittest.cc',
+      'browser/policy/managed_bookmarks_policy_handler_unittest.cc',
+      'browser/policy/policy_path_parser_unittest.cc',
+      'browser/policy/profile_policy_connector_unittest.cc',
+      'browser/prefs/proxy_policy_unittest.cc',
+      'browser/profiles/incognito_mode_policy_handler_unittest.cc',
+      'browser/sessions/restore_on_startup_policy_handler_unittest.cc',
+    ],
+    # This is extensions && policy sources.
+    'chrome_unit_tests_extensions_policy_sources': [
+      'browser/extensions/api/storage/policy_value_store_unittest.cc',
+      'browser/extensions/policy_handlers_unittest.cc',
+    ],
     'chrome_unit_tests_speech_sources': [
       'browser/speech/extension_api/extension_manifests_tts_unittest.cc',
       'browser/speech/tts_controller_unittest.cc',
     ],
     'chrome_unit_tests_notifications_sources': [
       'browser/notifications/desktop_notification_profile_util_unittest.cc',
       'browser/notifications/message_center_notifications_unittest.cc',
       'browser/notifications/message_center_settings_controller_unittest.cc',
       'browser/notifications/notification_permission_context_unittest.cc',
       'browser/notifications/platform_notification_service_unittest.cc',
@@ skipping 920 matching lines @@
         '../components/components.gyp:browser_sync_browser_test_support',
         '../components/components.gyp:gcm_driver_test_support',
         '../components/components.gyp:history_core_test_support',
         '../components/components.gyp:instance_id_test_support',
         '../components/components.gyp:invalidation_impl',
         '../components/components.gyp:invalidation_test_support',
         '../components/components.gyp:metrics_test_support',
         '../components/components.gyp:offline_pages_test_support',
         '../components/components.gyp:omnibox_test_support',
         '../components/components.gyp:password_manager_core_browser_test_support',
-        '../components/components.gyp:policy_component_test_support',
-        '../components/components.gyp:policy_test_support',
         '../components/components.gyp:pref_registry_test_support',
         '../components/components.gyp:rappor_test_support',
         '../components/components.gyp:search_engines_test_support',
         '../components/components.gyp:signin_core_browser_test_support',
         '../components/components.gyp:sync_driver_test_support',
         '../components/components.gyp:sync_sessions_test_support',
         '../components/components.gyp:syncable_prefs_test_support',
         '../components/components.gyp:toolbar_test_support',
         '../components/components.gyp:update_client_test_support',
         '../components/components.gyp:user_prefs_tracked_test_support',
         '../components/prefs/prefs.gyp:prefs_test_support',
         '../content/content.gyp:content_app_both',
         '../content/content_shell_and_tests.gyp:content_browser_test_base',
         '../content/content_shell_and_tests.gyp:test_support_content',
         '../net/net.gyp:net',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
         '../sql/sql.gyp:sql',
         '../sql/sql.gyp:test_support_sql',
         '../sync/sync.gyp:sync',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../third_party/zlib/zlib.gyp:zlib',
         '../ui/gfx/gfx.gyp:gfx_test_support',
         '../ui/message_center/message_center.gyp:message_center_test_support',
       ],
       'export_dependent_settings': [
         '../base/base.gyp:test_support_base',
-        '../components/components.gyp:policy_component_test_support',
-        '../components/components.gyp:policy_test_support',
         '../content/content_shell_and_tests.gyp:test_support_content',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'app/chrome_main_delegate.cc',
         'app/chrome_main_delegate.h',
         'browser/browsing_data/mock_browsing_data_appcache_helper.cc',
         'browser/browsing_data/mock_browsing_data_appcache_helper.h',
@@ skipping 22 matching lines @@
         'browser/download/test_download_shelf.cc',
         'browser/download/test_download_shelf.h',
         'browser/media/fake_desktop_media_list.cc',
         'browser/media/fake_desktop_media_list.h',
         'browser/net/dns_probe_test_util.cc',
         'browser/net/dns_probe_test_util.h',
         'browser/net/url_request_mock_util.cc',
         'browser/net/url_request_mock_util.h',
         'browser/notifications/notification_test_util.cc',
         'browser/notifications/notification_test_util.h',
-        'browser/policy/test/local_policy_test_server.cc',
-        'browser/policy/test/local_policy_test_server.h',
         'browser/profile_resetter/profile_resetter_test_base.cc',
         'browser/profile_resetter/profile_resetter_test_base.h',
         'browser/search_engines/template_url_service_factory_test_util.cc',
         'browser/search_engines/template_url_service_factory_test_util.h',
         'browser/search_engines/template_url_service_test_util.cc',
         'browser/search_engines/template_url_service_test_util.h',
         'browser/sessions/session_restore_test_helper.cc',
         'browser/sessions/session_restore_test_helper.h',
         'browser/sessions/session_service_test_helper.cc',
         'browser/sessions/session_service_test_helper.h',
@@ skipping 236 matching lines @@
           'sources': [
             'test/base/default_ash_event_generator_delegate.cc',
             'test/base/default_ash_event_generator_delegate.h',
           ],
           'dependencies': [
             '../ash/ash.gyp:ash',
             '../ui/aura/aura.gyp:aura',
             '../ui/aura/aura.gyp:aura_test_support',
           ],
         }],
+        ['configuration_policy==1', {
+          'dependencies': [
+            '../components/components.gyp:policy_component_test_support',
+            '../components/components.gyp:policy_test_support',
+          ],
+          'export_dependent_settings': [
+            '../components/components.gyp:policy_component_test_support',
+            '../components/components.gyp:policy_test_support',
+          ],
+          'sources': [
+            'browser/policy/test/local_policy_test_server.cc',
+            'browser/policy/test/local_policy_test_server.h',
+          ],
+        }],
         ['safe_browsing==1', {
           'sources': [
             'browser/extensions/fake_safe_browsing_database_manager.cc',
             'browser/extensions/fake_safe_browsing_database_manager.h',
           ],
         }],
         ['OS=="linux"', {
           'dependencies': [
             '../build/linux/system.gyp:ssl',
           ],
@@ skipping 266 matching lines @@
             ['include', '^common/translate/language_detection_util_unittest\\.cc$'],
             ['include', '^common/translate/translate_util_unittest\\.cc$'],
             ['include', '^common/zip_'],
           ],
           # Bundle all the necessary resources into the test bundle.
           'includes': ['chrome_ios_bundle_resources.gypi'],
           'xcode_settings': {'OTHER_LDFLAGS': ['-ObjC']},
         }],
         ['OS=="android"', {
           'sources': [ '<@(chrome_unit_tests_offline_pages_sources)' ],
-          'sources!': [
-            'browser/policy/policy_path_parser_unittest.cc',
-          ],
           'dependencies!': [
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
           ],
           'ldflags': [
             # Some android targets still depend on --gc-sections to link.
             # TODO: remove --gc-sections for Debug builds (crbug.com/159847).
             '-Wl,--gc-sections',
           ],
           'dependencies': [
             '../testing/android/native_test.gyp:native_test_native_code',
@@ skipping 17 matching lines @@
           ],
           'sources': [
             '<@(chrome_unit_tests_non_mobile_sources)',
             '<@(chrome_unit_tests_js_sources)',
             '<@(chrome_unit_tests_gtestjs_sources)',
           ],
         }],
         ['chromeos==1', {
           'sources!': [
             'browser/signin/chrome_signin_status_metrics_provider_delegate_unittest.cc',
-            'browser/policy/cloud/user_policy_signin_service_unittest.cc',
           ],
         }],
         ['enable_background==1', {
           'sources': [ '<@(chrome_unit_tests_background_sources)' ],
         }],
         ['enable_spellcheck==1', {
           'sources': [ '<@(chrome_unit_tests_spellchecker_sources)' ],
           'conditions': [
             ['OS!="mac" and OS!="ios"', {
               'dependencies': [ '../third_party/hunspell/hunspell.gyp:hunspell' ],
@@ skipping 16 matching lines @@
         ['enable_extensions==1', {
           'sources': [ '<@(chrome_unit_tests_extensions_sources)' ],
           'dependencies': [
             'common/extensions/api/api.gyp:chrome_api',
             '../device/hid/hid.gyp:device_hid_mocks',
             '../components/components.gyp:audio_modem_test_support',
             '../extensions/extensions_resources.gyp:extensions_resources',
             '../extensions/extensions_strings.gyp:extensions_strings',
           ],
           'conditions': [
+            ['configuration_policy==1', {
+              'sources': [ '<@(chrome_unit_tests_extensions_policy_sources)' ],
+            }],
             ['enable_service_discovery==1', {
               'sources': [ '<@(chrome_unit_tests_extensions_service_discovery_sources)' ],
             }],
             ['chromeos==0', {
               'sources': [
                 '<@(chrome_unit_tests_extensions_non_chromeos_sources)',
               ],
             }],
           ],
         }],
@@ skipping 20 matching lines @@
           'dependencies': [
             '../ui/wm/wm.gyp:wm',
             '../ui/aura/aura.gyp:aura_test_support',
           ],
         }],
         ['chromeos==0 and OS=="linux"', {
           'sources': [ '<@(chrome_unit_tests_desktop_linux_sources)' ],
         }],
         ['OS!="android" and OS!="ios" and chromeos==0', {
           'sources': [
-            'browser/net/disk_cache_dir_policy_handler_unittest.cc',
             'browser/profiles/profile_list_desktop_unittest.cc',
             'browser/profiles/profile_statistics_unittest.cc',
           ],
         }],
         ['chromeos==0 and use_ozone==0 and OS=="linux"', {
           'dependencies': [
             'browser/ui/libgtk2ui/libgtk2ui.gyp:gtk2ui',
             '../build/linux/system.gyp:gio',
           ],
         }],
         ['use_aura==1 or toolkit_views==1', {
           'dependencies': [
             '../ui/events/events.gyp:events_test_support',
           ],
         }],
         ['enable_task_manager==1', {
           'sources': [ '<@(chrome_unit_tests_task_manager_sources)' ],
           'dependencies': [ '../gpu/gpu.gyp:gpu' ],
         }],
         ['enable_mdns==1', {
           'sources': [ '<@(chrome_unit_tests_mdns_sources)' ],
         }],
         ['enable_service_discovery==1', {
           'sources': [ '<@(chrome_unit_tests_service_discovery_sources)' ],
         }],
+        ['configuration_policy==1', {
+          'sources': [ '<@(chrome_unit_tests_configuration_policy_sources)' ],
+          'conditions': [
+            ['chromeos==1', {
+              'sources!': [
+                'browser/policy/cloud/user_policy_signin_service_unittest.cc',
+              ],
+            }],
+            ['OS=="android"', {
+              'sources!': [
+                'browser/policy/policy_path_parser_unittest.cc',
+              ],
+            }],
+            ['OS!="android" and OS!="ios" and chromeos==0', {
+              'sources': [
+                'browser/net/disk_cache_dir_policy_handler_unittest.cc',
+              ],
+            }],
+            ['OS!="android" and OS!="ios"', {
+              'sources': [
+                'browser/download/download_dir_policy_handler_unittest.cc'
+              ],
+            }],
+          ],
+        }],
         ['enable_web_speech==1', {
           'sources': [ '<@(chrome_unit_tests_speech_sources)' ],
         }],
         ['notifications==1', {
           'sources': [ '<@(chrome_unit_tests_notifications_sources)' ],
           'conditions': [
             ['OS == "android"', {
               'sources!': [
                 # Android does not use the Message Center notification system.
                 'browser/notifications/message_center_notifications_unittest.cc',
@@ skipping 551 matching lines @@
               'dependencies': [
                 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
               ],
             }],
           ],
         },
       ],
     }],
   ],  # 'conditions'
 }