Revert of Remove configuration policy from chrome build files.

chrome/chrome_browser.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': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 408 matching lines @@
       'browser/page_load_metrics/page_load_metrics_initialize.h',
       'browser/performance_monitor/performance_monitor.cc',
       'browser/performance_monitor/performance_monitor.h',
       'browser/performance_monitor/process_metrics_history.cc',
       'browser/performance_monitor/process_metrics_history.h',
       'browser/platform_util.h',
       'browser/platform_util_chromeos.cc',
       'browser/platform_util_internal.h',
       'browser/platform_util_mac.mm',
       'browser/platform_util_win.cc',
-      'browser/policy/chrome_browser_policy_connector.cc',
-      'browser/policy/chrome_browser_policy_connector.h',
-      'browser/policy/cloud/cloud_policy_invalidator.cc',
-      'browser/policy/cloud/cloud_policy_invalidator.h',
-      'browser/policy/cloud/policy_header_service_factory.cc',
-      'browser/policy/cloud/policy_header_service_factory.h',
-      'browser/policy/cloud/remote_commands_invalidator.cc',
-      'browser/policy/cloud/remote_commands_invalidator.h',
-      'browser/policy/cloud/remote_commands_invalidator_impl.cc',
-      'browser/policy/cloud/remote_commands_invalidator_impl.h',
-      'browser/policy/cloud/user_cloud_policy_invalidator.cc',
-      'browser/policy/cloud/user_cloud_policy_invalidator.h',
-      'browser/policy/cloud/user_cloud_policy_invalidator_factory.cc',
-      'browser/policy/cloud/user_cloud_policy_invalidator_factory.h',
-      'browser/policy/configuration_policy_handler_list_factory.cc',
-      'browser/policy/configuration_policy_handler_list_factory.h',
-      'browser/policy/device_management_service_configuration.cc',
-      'browser/policy/device_management_service_configuration.h',
-      'browser/policy/file_selection_dialogs_policy_handler.cc',
-      'browser/policy/file_selection_dialogs_policy_handler.h',
-      'browser/policy/javascript_policy_handler.cc',
-      'browser/policy/javascript_policy_handler.h',
-      'browser/policy/managed_bookmarks_policy_handler.cc',
-      'browser/policy/managed_bookmarks_policy_handler.h',
-      'browser/policy/network_prediction_policy_handler.cc',
-      'browser/policy/network_prediction_policy_handler.h',
-      'browser/policy/policy_helpers.cc',
-      'browser/policy/policy_helpers.h',
-      'browser/policy/profile_policy_connector.cc',
-      'browser/policy/profile_policy_connector.h',
-      'browser/policy/profile_policy_connector_factory.cc',
-      'browser/policy/profile_policy_connector_factory.h',
-      'browser/policy/schema_registry_service.cc',
-      'browser/policy/schema_registry_service.h',
-      'browser/policy/schema_registry_service_factory.cc',
-      'browser/policy/schema_registry_service_factory.h',
-      'browser/sessions/restore_on_startup_policy_handler.cc',
-      'browser/sessions/restore_on_startup_policy_handler.h',
-      'browser/profiles/incognito_mode_policy_handler.cc',
-      'browser/profiles/incognito_mode_policy_handler.h',
       'browser/prerender/prerender_config.cc',
       'browser/prerender/prerender_config.h',
       'browser/prerender/prerender_contents.cc',
       'browser/prerender/prerender_contents.h',
       'browser/prerender/prerender_field_trial.cc',
       'browser/prerender/prerender_field_trial.h',
       'browser/prerender/prerender_final_status.cc',
       'browser/prerender/prerender_final_status.h',
       'browser/prerender/prerender_handle.cc',
       'browser/prerender/prerender_handle.h',
@@ skipping 582 matching lines @@
       'browser/metrics/perf/windowed_incognito_observer.cc',
       'browser/metrics/perf/windowed_incognito_observer.h',
       # This is technically also dependent on enable_plugins but we don't
       # support ChromeOS with enable_plugins==0.
       'browser/renderer_host/pepper/pepper_platform_verification_message_filter.cc',
       'browser/renderer_host/pepper/pepper_platform_verification_message_filter.h',
     ],
     # Everything but Android, iOS, and CrOS.
     'chrome_browser_desktop_sources': [
       'browser/platform_util.cc',
-      'browser/policy/cloud/user_policy_signin_service.cc',
-      'browser/policy/cloud/user_policy_signin_service.h',
       'browser/profiles/avatar_menu_actions_desktop.cc',
       'browser/profiles/avatar_menu_actions_desktop.h',
       'browser/profiles/avatar_menu_desktop.cc',
       'browser/profiles/avatar_menu_observer.h',
       'browser/profiles/profile_list_desktop.cc',
       'browser/profiles/profile_list_desktop.h',
       'browser/profiles/profile_statistics.cc',
       'browser/profiles/profile_statistics.h',
       'browser/profiles/profile_statistics_aggregator.cc',
       'browser/profiles/profile_statistics_aggregator.h',
       'browser/profiles/profile_statistics_common.cc',
       'browser/profiles/profile_statistics_common.h',
       'browser/profiles/profile_statistics_factory.cc',
       'browser/profiles/profile_statistics_factory.h',
       'browser/signin/cross_device_promo.cc',
       'browser/signin/cross_device_promo.h',
       'browser/signin/cross_device_promo_factory.cc',
       'browser/signin/cross_device_promo_factory.h',
       'browser/signin/signin_global_error.cc',
       'browser/signin/signin_global_error.h',
       'browser/signin/signin_global_error_factory.cc',
       'browser/signin/signin_global_error_factory.h',
-      'browser/sync/sync_global_error.cc',
-      'browser/sync/sync_global_error.h',
-      'browser/sync/sync_global_error_factory.cc',
-      'browser/sync/sync_global_error_factory.h',
-      'browser/upgrade_detector_impl.cc',
-      'browser/upgrade_detector_impl.h',
     ],
     # Miscellaneous files that were brought up on iOS before the decision not
     # to use chrome/ for iOS. These, plus a few of the directory-specific
     # source lists below, are all that are built on iOS. These are built
     # despite the change in direction in order to prevent iOS regressions while
     # componentization is in progress.
     # TODO(stuartmorgan): Remove this once enough has been componentized that
     # there's no value in building any of chrome/ for iOS.
     'chrome_browser_ios_sources': [
       'browser/browser_process.cc',
@@ skipping 26 matching lines @@
       'browser/web_applications/web_app_linux.cc',
     ],
     'chrome_browser_mac_sources': [
       'browser/password_manager/password_manager_util_mac.h',
       'browser/password_manager/password_manager_util_mac.mm',
     ],
     # Android and iOS, not CrOS.
     'chrome_browser_mobile_sources': [
       'browser/chrome_browser_field_trials_mobile.cc',
       'browser/chrome_browser_field_trials_mobile.h',
-      'browser/policy/cloud/user_policy_signin_service_mobile.cc',
-      'browser/policy/cloud/user_policy_signin_service_mobile.h',
     ],
     # Everything but Android and iOS.
     'chrome_browser_non_mobile_sources': [
       'browser/accessibility/invert_bubble_prefs.cc',
       'browser/accessibility/invert_bubble_prefs.h',
       'browser/background/background_contents.cc',
       'browser/background/background_contents.h',
       'browser/banners/app_banner_data_fetcher_desktop.cc',
       'browser/banners/app_banner_data_fetcher_desktop.h',
       'browser/banners/app_banner_infobar_delegate_desktop.cc',
@@ skipping 1152 matching lines @@
       'browser/renderer_host/pepper/pepper_output_protection_message_filter.h',
     ],
     'chrome_browser_plugin_installation_sources': [
       'browser/plugins/plugin_installer.cc',
       'browser/plugins/plugin_installer.h',
       'browser/plugins/plugin_installer_observer.cc',
       'browser/plugins/plugin_installer_observer.h',
       'browser/plugins/plugins_resource_service.cc',
       'browser/plugins/plugins_resource_service.h',
     ],
-    # Applies to all platforms but ChromeOS.
-    'chrome_browser_non_chromeos_sources': [
+    # Files to compile when configuration policy is disabled. Note that the
+    # connector factory is also used when policy is enabled.
+    'chrome_browser_policy_disabled_sources': [
+      'browser/policy/profile_policy_connector.h',
+      'browser/policy/profile_policy_connector_factory.cc',
+      'browser/policy/profile_policy_connector_factory.h',
+      'browser/policy/profile_policy_connector_stub.cc',
+    ],
+    # Files to use when configuration policy is enabled that are also shared
+    # with iOS. Non-iOS policy files are below.
+    'chrome_browser_policy_shared_with_ios_sources': [
+      'browser/policy/cloud/cloud_policy_invalidator.cc',
+      'browser/policy/cloud/cloud_policy_invalidator.h',
+      'browser/policy/cloud/policy_header_service_factory.cc',
+      'browser/policy/cloud/policy_header_service_factory.h',
+      'browser/policy/cloud/user_cloud_policy_invalidator.cc',
+      'browser/policy/cloud/user_cloud_policy_invalidator.h',
+      'browser/policy/cloud/user_cloud_policy_invalidator_factory.cc',
+      'browser/policy/cloud/user_cloud_policy_invalidator_factory.h',
+      'browser/policy/configuration_policy_handler_list_factory.cc',
+      'browser/policy/configuration_policy_handler_list_factory.h',
+      'browser/policy/managed_bookmarks_policy_handler.cc',
+      'browser/policy/managed_bookmarks_policy_handler.h',
+      'browser/policy/policy_helpers.cc',
+      'browser/policy/policy_helpers.h',
+      'browser/policy/profile_policy_connector.cc',
+      'browser/policy/profile_policy_connector.h',
+      'browser/policy/profile_policy_connector_factory.cc',
+      'browser/policy/profile_policy_connector_factory.h',
+      'browser/policy/schema_registry_service.cc',
+      'browser/policy/schema_registry_service.h',
+      'browser/policy/schema_registry_service_factory.cc',
+      'browser/policy/schema_registry_service_factory.h',
+      'browser/profiles/incognito_mode_policy_handler.cc',
+      'browser/profiles/incognito_mode_policy_handler.h',
+    ],
+    # Same as the "policy shared with ios" section above, but these files are
+    # not used on ChromeOS.
+    'chrome_browser_policy_shared_with_ios_not_chromeos_sources': [
       'browser/policy/cloud/user_cloud_policy_manager_factory.cc',
       'browser/policy/cloud/user_cloud_policy_manager_factory.h',
       'browser/policy/cloud/user_policy_signin_service_base.cc',
       'browser/policy/cloud/user_policy_signin_service_base.h',
       'browser/policy/cloud/user_policy_signin_service_factory.cc',
       'browser/policy/cloud/user_policy_signin_service_factory.h',
     ],
+    # Files to use when configuration policy is enabled that are not shared
+    # with iOS.
+    'chrome_browser_policy_non_ios_sources': [
+      'browser/policy/chrome_browser_policy_connector.cc',
+      'browser/policy/chrome_browser_policy_connector.h',
+      'browser/policy/cloud/remote_commands_invalidator.cc',
+      'browser/policy/cloud/remote_commands_invalidator.h',
+      'browser/policy/cloud/remote_commands_invalidator_impl.cc',
+      'browser/policy/cloud/remote_commands_invalidator_impl.h',
+      'browser/policy/device_management_service_configuration.cc',
+      'browser/policy/device_management_service_configuration.h',
+      'browser/policy/file_selection_dialogs_policy_handler.cc',
+      'browser/policy/file_selection_dialogs_policy_handler.h',
+      'browser/policy/javascript_policy_handler.cc',
+      'browser/policy/javascript_policy_handler.h',
+      'browser/policy/network_prediction_policy_handler.cc',
+      'browser/policy/network_prediction_policy_handler.h',
+      'browser/sessions/restore_on_startup_policy_handler.cc',
+      'browser/sessions/restore_on_startup_policy_handler.h',
+    ],
+    # Policy sources used only on Android and iOS (CrOS not counted).
+    'chrome_browser_policy_mobile_sources': [
+      'browser/policy/cloud/user_policy_signin_service_mobile.cc',
+      'browser/policy/cloud/user_policy_signin_service_mobile.h',
+    ],
+    # Policy sources used only on desktop OS's (CrOS not counted).
+    'chrome_browser_policy_desktop_sources': [
+      'browser/policy/cloud/user_policy_signin_service.cc',
+      'browser/policy/cloud/user_policy_signin_service.h',
+      'browser/sync/sync_global_error.cc',
+      'browser/sync/sync_global_error.h',
+      'browser/sync/sync_global_error_factory.cc',
+      'browser/sync/sync_global_error_factory.h',
+      'browser/upgrade_detector_impl.cc',
+      'browser/upgrade_detector_impl.h',
+    ],
     'chrome_browser_predictor_sources': [
       'browser/predictors/autocomplete_action_predictor.cc',
       'browser/predictors/autocomplete_action_predictor.h',
       'browser/predictors/autocomplete_action_predictor_factory.cc',
       'browser/predictors/autocomplete_action_predictor_factory.h',
       'browser/predictors/autocomplete_action_predictor_table.cc',
       'browser/predictors/autocomplete_action_predictor_table.h',
       'browser/predictors/predictor_database.cc',
       'browser/predictors/predictor_database.h',
       'browser/predictors/predictor_database_factory.cc',
@@ skipping 796 matching lines @@
         'chrome_resources.gyp:theme_resources',
         'common',
         'probe_message_proto',
         '../components/components.gyp:autofill_core_browser',
         '../components/components.gyp:bookmarks_browser',
         '../components/components.gyp:bookmarks_managed',
         '../components/components.gyp:browser_sync_browser',
         '../components/components.gyp:browser_sync_common',
         '../components/components.gyp:captive_portal',
         '../components/components.gyp:cloud_devices_common',
-        '../components/components.gyp:cloud_policy_proto',
         '../components/components.gyp:component_metrics_proto',
         '../components/components.gyp:component_updater',
         '../components/components.gyp:content_settings_content_common',
         '../components/components.gyp:content_settings_core_browser',
         '../components/components.gyp:content_settings_core_common',
         '../components/components.gyp:crx_file',
         '../components/components.gyp:data_reduction_proxy_core_browser',
         '../components/components.gyp:data_usage_core',
         '../components/components.gyp:data_use_measurement_core',
         '../components/components.gyp:favicon_base',
@@ skipping 10 matching lines @@
         '../components/components.gyp:metrics_net',
         '../components/components.gyp:metrics_services_manager',
         '../components/components.gyp:metrics_ui',
         '../components/components.gyp:navigation_metrics',
         '../components/components.gyp:network_time',
         '../components/components.gyp:offline_pages',
         '../components/components.gyp:omnibox_browser',
         '../components/components.gyp:os_crypt',
         '../components/components.gyp:password_manager_core_browser',
         '../components/components.gyp:password_manager_core_common',
-        '../components/components.gyp:policy',
         '../components/components.gyp:policy_component',
         '../components/components.gyp:proxy_config',
         '../components/components.gyp:query_parser',
         '../components/components.gyp:rappor',
         '../components/components.gyp:search',
         '../components/components.gyp:search_engines',
         '../components/components.gyp:search_provider_logos',
         '../components/components.gyp:security_interstitials_core',
         '../components/components.gyp:security_state',
         '../components/components.gyp:ssl_errors',
@@ skipping 235 matching lines @@
         ['OS=="win" or OS=="mac"', {
           'sources': [
             '<@(chrome_browser_win_mac_sources)',
           ],
         }],
         ['OS!="win" and OS!="mac" and OS!="ios"', {
           'sources': [
             'browser/net/net_error_diagnostics_dialog_generic.cc',
           ],
         }],
-        ['OS!="android" and OS!="ios" and chromeos==0', {
+        ['OS!="android" and OS!="ios" and chromeos==0 and configuration_policy==1', {
           'sources': [
             'browser/net/disk_cache_dir_policy_handler.cc',
             'browser/net/disk_cache_dir_policy_handler.h',
           ],
         }],
-        ['OS!="android" and OS!="ios"', {
+        ['OS!="android" and OS!="ios" and configuration_policy==1', {
           'sources': [
             'browser/download/download_dir_policy_handler.cc',
             'browser/download/download_dir_policy_handler.h',
           ],
         }],
         ['OS=="mac"', {
           'dependencies': [
             'app_shim',
             'browser_app_shim',
           ],
           'sources': [ '<@(chrome_browser_mac_sources)' ]
         }],
         ['OS=="win"', {
           'dependencies': [
             'file_pre_reader',
           ],
         }],
         ['OS=="mac" or OS=="android"', {
           'sources': [
             '<@(chrome_browser_password_manager_mac_android_sources)',
           ],
         }],
         ['chromeos==1', {
           'sources!': [
             'browser/signin/chrome_signin_status_metrics_provider_delegate.cc',
             'browser/signin/chrome_signin_status_metrics_provider_delegate.h',
           ],
-        }, {  # Non-ChromeOS
-          'sources': [ '<@(chrome_browser_non_chromeos_sources)' ],
         }],
         ['enable_extensions==1', {
           'dependencies': [
             'browser_extensions',
             'browser/extensions/api/api_registration.gyp:chrome_api_registration',
             'common/extensions/api/api.gyp:chrome_api',
             'sync_file_system_drive_proto',
             '../components/components.gyp:cryptauth',
             '../components/components.gyp:drive',
             '../gpu/gpu.gyp:gpu',
@@ skipping 45 matching lines @@
           'sources': [ '<@(chrome_browser_nacl_sources)' ],
           'dependencies': [
             '../components/nacl.gyp:nacl_browser',
           ],
         }],
         ['debug_devtools==1', {
           'defines': [
             'DEBUG_DEVTOOLS=1',
           ],
         }],
+        ['configuration_policy==1', {
+          'sources': [ '<@(chrome_browser_policy_shared_with_ios_sources)' ],
+          'dependencies': [
+            '../components/components.gyp:cloud_policy_proto',
+            '../components/components.gyp:policy',
+          ],
+          'conditions': [
+            ['OS!="ios"', {
+              'sources': [ '<@(chrome_browser_policy_non_ios_sources)' ],
+            }],
+            ['chromeos==0', {
+              'sources': [
+                '<@(chrome_browser_policy_shared_with_ios_not_chromeos_sources)',
+              ],
+            }],
+            ['OS=="win" or OS=="mac" or desktop_linux==1', {
+              'sources': [ '<@(chrome_browser_policy_desktop_sources)' ],
+            }],
+            ['OS=="android" or OS=="ios"', {  # Mobile.
+              'sources': [ '<@(chrome_browser_policy_mobile_sources)' ],
+            }, {  # Non-mobile.
+              'dependencies': [
+                'policy_path_parser',
+              ],
+            }],
+          ],
+        }, {  # configuration_policy==0
+          'sources': [ '<@(chrome_browser_policy_disabled_sources)' ],
+        }],
         ['enable_plugins==1', {
           'dependencies': [
             '../components/components.gyp:pdf_browser',
             '../ppapi/ppapi_internal.gyp:ppapi_ipc',
             '../third_party/adobe/flash/flash_player.gyp:flapper_version_h',
           ],
           'sources': [ '<@(chrome_browser_plugins_sources)' ],
         }],
         ['safe_browsing != 0 and OS != "ios"', {
           'sources': [ '<@(chrome_browser_safe_browsing_basic_sources)' ],
@@ skipping 167 matching lines @@
           'sources': [ '<@(chrome_browser_session_service_sources)' ],
         }],
         ['enable_hotwording==1', {
           'defines': [ 'ENABLE_HOTWORDING' ],
         }],
         ['OS!="android" and OS!="ios" and chromeos==0', {
           'sources': [ '<@(chrome_browser_desktop_sources)' ],
         }],
         ['OS=="android" or OS=="ios"', {
           'sources': [ '<@(chrome_browser_mobile_sources)' ],
-        }, {  # OS!="android" and OS!="ios" (non-Mobile).
+        }, {  # OS!="android" and OS!="ios"
           'sources': [ '<@(chrome_browser_non_mobile_sources)' ],
           'dependencies': [
             '../components/components.gyp:feedback_component',
             '../net/net.gyp:net_browser_services',
-            'policy_path_parser',
             'profile_reset_report_proto',
           ]
         }],
         ['OS=="android"', {
           'dependencies': [
             '../build/android/ndk.gyp:cpu_features',
             '../components/components.gyp:cdm_browser',
             '../components/components_resources.gyp:components_resources',
             '../third_party/android_opengl/etc1/etc1.gyp:etc1',
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput_util',
@@ skipping 452 matching lines @@
             '../components/components.gyp:rlz',
             '../components/components.gyp:search_engines',
             '../rlz/rlz.gyp:rlz_lib',
             'common',
           ],
         },
       ],
     }],
   ],
 }