Split up chrome/browser/policy subdirectory

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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
@@ skipping 1317 matching lines @@
         'browser/plugins/plugin_prefs.cc',
         'browser/plugins/plugin_prefs.h',
         'browser/plugins/plugin_prefs_factory.cc',
         'browser/plugins/plugin_prefs_factory.h',
         'browser/plugins/plugin_status_pref_setter.cc',
         'browser/plugins/plugin_status_pref_setter.h',
         'browser/policy/async_policy_loader.cc',
         'browser/policy/async_policy_loader.h',
         'browser/policy/async_policy_provider.cc',
         'browser/policy/async_policy_provider.h',
-        'browser/policy/app_pack_updater.cc',
-        'browser/policy/app_pack_updater.h',
-        'browser/policy/auto_enrollment_client.cc',
-        'browser/policy/auto_enrollment_client.h',
         'browser/policy/browser_policy_connector.cc',
         'browser/policy/browser_policy_connector.h',
-        'browser/policy/cloud_policy_client.cc',
-        'browser/policy/cloud_policy_client.h',
-        'browser/policy/cloud_policy_constants.cc',
-        'browser/policy/cloud_policy_constants.h',
-        'browser/policy/cloud_policy_core.cc',
-        'browser/policy/cloud_policy_core.h',
-        'browser/policy/cloud_policy_manager.cc',
-        'browser/policy/cloud_policy_manager.h',
-        'browser/policy/cloud_policy_refresh_scheduler.cc',
-        'browser/policy/cloud_policy_refresh_scheduler.h',
-        'browser/policy/cloud_policy_service.cc',
-        'browser/policy/cloud_policy_service.h',
-        'browser/policy/cloud_policy_store.cc',
-        'browser/policy/cloud_policy_store.h',
-        'browser/policy/cloud_policy_validator.cc',
-        'browser/policy/cloud_policy_validator.h',
+        'browser/policy/cloud/cloud_policy_client.cc',
+        'browser/policy/cloud/cloud_policy_client.h',
+        'browser/policy/cloud/cloud_policy_constants.cc',
+        'browser/policy/cloud/cloud_policy_constants.h',
+        'browser/policy/cloud/cloud_policy_core.cc',
+        'browser/policy/cloud/cloud_policy_core.h',
+        'browser/policy/cloud/cloud_policy_manager.cc',
+        'browser/policy/cloud/cloud_policy_manager.h',
+        'browser/policy/cloud/cloud_policy_refresh_scheduler.cc',
+        'browser/policy/cloud/cloud_policy_refresh_scheduler.h',
+        'browser/policy/cloud/cloud_policy_service.cc',
+        'browser/policy/cloud/cloud_policy_service.h',
+        'browser/policy/cloud/cloud_policy_store.cc',
+        'browser/policy/cloud/cloud_policy_store.h',
+        'browser/policy/cloud/cloud_policy_validator.cc',
+        'browser/policy/cloud/cloud_policy_validator.h',
+        'browser/policy/cloud/device_management_service.cc',
+        'browser/policy/cloud/device_management_service.h',
+        'browser/policy/cloud/enterprise_metrics.cc',
+        'browser/policy/cloud/enterprise_metrics.h',
+        'browser/policy/cloud/message_util.cc',
+        'browser/policy/cloud/message_util.h',
+        'browser/policy/cloud/user_cloud_policy_manager.cc',
+        'browser/policy/cloud/user_cloud_policy_manager.h',
+        'browser/policy/cloud/user_cloud_policy_manager_factory.cc',
+        'browser/policy/cloud/user_cloud_policy_manager_factory.h',
+        'browser/policy/cloud/user_cloud_policy_store.cc',
+        'browser/policy/cloud/user_cloud_policy_store.h',
+        'browser/policy/cloud/user_cloud_policy_store_base.cc',
+        'browser/policy/cloud/user_cloud_policy_store_base.h',
+        'browser/policy/cloud/user_info_fetcher.cc',
+        'browser/policy/cloud/user_info_fetcher.h',
+        'browser/policy/cloud/user_policy_disk_cache.cc',
+        'browser/policy/cloud/user_policy_disk_cache.h',
+        'browser/policy/cloud/user_policy_signin_service.cc',
+        'browser/policy/cloud/user_policy_signin_service.h',
+        'browser/policy/cloud/user_policy_signin_service_factory.cc',
+        'browser/policy/cloud/user_policy_signin_service_factory.h',
+        'browser/policy/cloud/user_policy_token_loader.cc',
+        'browser/policy/cloud/user_policy_token_loader.h',
         'browser/policy/config_dir_policy_loader.cc',
         'browser/policy/config_dir_policy_loader.h',
         'browser/policy/configuration_policy_handler.cc',
         'browser/policy/configuration_policy_handler.h',
         'browser/policy/configuration_policy_handler_chromeos.cc',
         'browser/policy/configuration_policy_handler_chromeos.h',
         'browser/policy/configuration_policy_handler_list.cc',
         'browser/policy/configuration_policy_handler_list.h',
         'browser/policy/configuration_policy_pref_store.cc',
         'browser/policy/configuration_policy_pref_store.h',
         'browser/policy/configuration_policy_provider.cc',
         'browser/policy/configuration_policy_provider.h',
-        'browser/policy/device_management_service.cc',
-        'browser/policy/device_management_service.h',
-        'browser/policy/device_cloud_policy_manager_chromeos.cc',
-        'browser/policy/device_cloud_policy_manager_chromeos.h',
-        'browser/policy/device_cloud_policy_store_chromeos.cc',
-        'browser/policy/device_cloud_policy_store_chromeos.h',
-        'browser/policy/device_local_account_policy_provider.cc',
-        'browser/policy/device_local_account_policy_provider.h',
-        'browser/policy/device_local_account_policy_service.cc',
-        'browser/policy/device_local_account_policy_service.h',
-        'browser/policy/device_local_account_policy_store.cc',
-        'browser/policy/device_local_account_policy_store.h',
-        'browser/policy/device_policy_decoder_chromeos.cc',
-        'browser/policy/device_policy_decoder_chromeos.h',
-        'browser/policy/device_status_collector.cc',
-        'browser/policy/device_status_collector.h',
-        'browser/policy/enrollment_handler_chromeos.cc',
-        'browser/policy/enrollment_handler_chromeos.h',
-        'browser/policy/enrollment_status_chromeos.cc',
-        'browser/policy/enrollment_status_chromeos.h',
-        'browser/policy/enterprise_install_attributes.cc',
-        'browser/policy/enterprise_install_attributes.h',
-        'browser/policy/enterprise_metrics.cc',
-        'browser/policy/enterprise_metrics.h',
         'browser/policy/managed_mode_policy_provider.cc',
         'browser/policy/managed_mode_policy_provider.h',
-        'browser/policy/message_util.cc',
-        'browser/policy/message_util.h',
-        'browser/policy/network_configuration_updater.cc',
-        'browser/policy/network_configuration_updater.h',
         'browser/policy/policy_bundle.cc',
         'browser/policy/policy_bundle.h',
         'browser/policy/policy_error_map.cc',
         'browser/policy/policy_error_map.h',
         'browser/policy/policy_loader_mac.cc',
         'browser/policy/policy_loader_mac.h',
         'browser/policy/policy_loader_win.cc',
         'browser/policy/policy_loader_win.h',
         'browser/policy/policy_map.cc',
         'browser/policy/policy_map.h',
         'browser/policy/policy_path_parser.h',
+        'browser/policy/policy_path_parser_linux.cc',
         'browser/policy/policy_path_parser_mac.mm',
-        'browser/policy/policy_path_parser_linux.cc',
         'browser/policy/policy_path_parser_win.cc',
         'browser/policy/policy_service.cc',
         'browser/policy/policy_service.h',
         'browser/policy/policy_service_impl.cc',
         'browser/policy/policy_service_impl.h',
         'browser/policy/policy_service_stub.cc',
         'browser/policy/policy_service_stub.h',
         'browser/policy/policy_statistics_collector.cc',
         'browser/policy/policy_statistics_collector.h',
         'browser/policy/policy_types.h',
         'browser/policy/preferences_mac.cc',
         'browser/policy/preferences_mac.h',
-        'browser/policy/proxy_policy_provider.cc',
-        'browser/policy/proxy_policy_provider.h',
         'browser/policy/url_blacklist_manager.cc',
         'browser/policy/url_blacklist_manager.h',
-        'browser/policy/user_cloud_policy_manager.cc',
-        'browser/policy/user_cloud_policy_manager.h',
-        'browser/policy/user_cloud_policy_manager_chromeos.cc',
-        'browser/policy/user_cloud_policy_manager_chromeos.h',
-        'browser/policy/user_cloud_policy_manager_factory.cc',
-        'browser/policy/user_cloud_policy_manager_factory.h',
-        'browser/policy/user_cloud_policy_store.cc',
-        'browser/policy/user_cloud_policy_store.h',
-        'browser/policy/user_cloud_policy_store_base.cc',
-        'browser/policy/user_cloud_policy_store_base.h',
-        'browser/policy/user_cloud_policy_store_chromeos.cc',
-        'browser/policy/user_cloud_policy_store_chromeos.h',
-        'browser/policy/user_info_fetcher.cc',
-        'browser/policy/user_info_fetcher.h',
-        'browser/policy/user_policy_disk_cache.cc',
-        'browser/policy/user_policy_disk_cache.h',
-        'browser/policy/user_policy_signin_service.cc',
-        'browser/policy/user_policy_signin_service.h',
-        'browser/policy/user_policy_signin_service_factory.cc',
-        'browser/policy/user_policy_signin_service_factory.h',
-        'browser/policy/user_policy_token_loader.cc',
-        'browser/policy/user_policy_token_loader.h',
         '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',
         'browser/predictors/predictor_database_factory.h',
@@ skipping 1011 matching lines @@
           'sources!': [
             'browser/extensions/api/input_ime/input_ime_api.cc',
             'browser/extensions/api/input_ime/input_ime_api.h',
             'browser/extensions/api/terminal/terminal_extension_helper.cc',
             'browser/extensions/api/terminal/terminal_extension_helper.h',
             'browser/extensions/api/terminal/terminal_private_api.cc',
             'browser/extensions/api/terminal/terminal_private_api.h',
             'browser/net/gaia/gaia_oauth_consumer.h',
             'browser/net/gaia/gaia_oauth_fetcher.cc',
             'browser/net/gaia/gaia_oauth_fetcher.h',
-            'browser/policy/app_pack_updater.cc',
-            'browser/policy/app_pack_updater.h',
-            'browser/policy/auto_enrollment_client.cc',
-            'browser/policy/auto_enrollment_client.h',
-            'browser/policy/cros_user_policy_cache.cc',
-            'browser/policy/cros_user_policy_cache.h',
-            'browser/policy/device_local_account_policy_provider.cc',
-            'browser/policy/device_local_account_policy_provider.h',
-            'browser/policy/device_local_account_policy_service.cc',
-            'browser/policy/device_local_account_policy_service.h',
-            'browser/policy/device_local_account_policy_store.cc',
-            'browser/policy/device_local_account_policy_store.h',
-            'browser/policy/device_policy_cache.cc',
-            'browser/policy/device_policy_cache.h',
-            'browser/policy/device_status_collector.cc',
-            'browser/policy/device_status_collector.h',
-            'browser/policy/enterprise_install_attributes.cc',
-            'browser/policy/enterprise_install_attributes.h',
-            'browser/policy/network_configuration_updater.cc',
-            'browser/policy/network_configuration_updater.h',
             'browser/policy/proto/chrome_device_policy.pb.cc',
             'browser/policy/proto/chrome_device_policy.pb.h',
-            'browser/policy/proxy_policy_provider.cc',
-            'browser/policy/proxy_policy_provider.h',
             'browser/renderer_host/offline_resource_throttle.cc',
             'browser/renderer_host/offline_resource_throttle.h',
           ],
         }, {  # chromeos==1
           'dependencies': [
             'browser_chromeos',
           ],
-          'sources/': [
-            ['exclude', 'browser/first_run/upgrade_util.cc'],
-            ['exclude', 'browser/first_run/upgrade_util.h'],
-            ['exclude', 'browser/first_run/upgrade_util_linux.cc'],
-            ['exclude', 'browser/icon_loader_linux.cc'],
-            ['exclude', 'browser/icon_manager_linux.cc'],
-            ['exclude', 'browser/idle_linux.cc'],
-            ['exclude', 'browser/password_manager/native_backend_gnome_x.cc'],
-            ['exclude', 'browser/password_manager/native_backend_gnome_x.h'],
-            ['exclude', 'browser/password_manager/native_backend_kwallet_x.cc'],
-            ['exclude', 'browser/password_manager/native_backend_kwallet_x.h'],
-            ['exclude', 'browser/platform_util_linux.cc'],
-            ['exclude', 'browser/policy/user_cloud_policy_manager.cc'],
-            ['exclude', 'browser/policy/user_cloud_policy_manager.h'],
-            ['exclude', 'browser/policy/user_cloud_policy_manager_factory.cc'],
-            ['exclude', 'browser/policy/user_cloud_policy_manager_factory.h'],
-            ['exclude', 'browser/policy/user_cloud_policy_store.cc'],
-            ['exclude', 'browser/policy/user_cloud_policy_store.h'],

[Joao da Silva, 2013/02/06 09:43:13]

Shouldn't these 2 stay excluded?

[Mattias Nissler (ping if slow), 2013/02/06 13:51:53]

Yes, good catch!

-            ['exclude', 'browser/policy/user_policy_signin_service.cc'],
-            ['exclude', 'browser/policy/user_policy_signin_service.h'],
-            ['exclude', 'browser/policy/user_policy_signin_service_factory.cc'],
-            ['exclude', 'browser/policy/user_policy_signin_service_factory.h'],
-            ['exclude', 'browser/speech/tts_linux.cc'],
-            ['exclude', 'browser/system_monitor/removable_device_notifications_linux.cc'],
-            ['exclude', 'browser/system_monitor/removable_device_notifications_linux.h'],
-            ['exclude', 'browser/ui/webui/help/version_updater_basic.cc'],
-            ['exclude', 'browser/ui/webui/help/version_updater_basic.h'],
-            ['exclude', 'browser/upgrade_detector_impl.cc'],
-            ['exclude', 'browser/upgrade_detector_impl.h'],
+          'sources!': [
+            'browser/first_run/upgrade_util.cc',
+            'browser/first_run/upgrade_util.h',
+            'browser/first_run/upgrade_util_linux.cc',
+            'browser/icon_loader_linux.cc',
+            'browser/icon_manager_linux.cc',
+            'browser/idle_linux.cc',
+            'browser/password_manager/native_backend_gnome_x.cc',
+            'browser/password_manager/native_backend_gnome_x.h',
+            'browser/password_manager/native_backend_kwallet_x.cc',
+            'browser/password_manager/native_backend_kwallet_x.h',
+            'browser/platform_util_linux.cc',
+            'browser/policy/cloud/user_cloud_policy_manager.cc',
+            'browser/policy/cloud/user_cloud_policy_manager.h',
+            '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.cc',
+            'browser/policy/cloud/user_policy_signin_service.h',
+            'browser/policy/cloud/user_policy_signin_service_factory.cc',
+            'browser/policy/cloud/user_policy_signin_service_factory.h',
+            'browser/speech/tts_linux.cc',
+            'browser/system_monitor/removable_device_notifications_linux.cc',
+            'browser/system_monitor/removable_device_notifications_linux.h',
+            'browser/ui/webui/help/version_updater_basic.cc',
+            'browser/ui/webui/help/version_updater_basic.h',
+            'browser/upgrade_detector_impl.cc',
+            'browser/upgrade_detector_impl.h',
           ],
         }],
         ['use_cups==1', {
           'dependencies': [
             '../printing/printing.gyp:cups',
           ],
         }],
         ['use_gnome_keyring==0', {
           'sources!': [
             'browser/password_manager/native_backend_gnome_x.cc',
@@ skipping 572 matching lines @@
           'variables': {
             'jni_gen_dir': 'chrome',
           },
           'includes': [ '../build/jni_generator.gypi' ],
         },
       ],
      },
     ],
   ],
 }