Device policy infrastructure

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 20fb1c6c1fd933c319b126e3ccaffabe1afc3b86..06f68c9595fddd966a539b8959d74228b0d7a2c4 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1662,8 +1662,15 @@
         'browser/policy/asynchronous_policy_loader.h',
         'browser/policy/asynchronous_policy_provider.cc',
         'browser/policy/asynchronous_policy_provider.h',
+        'browser/policy/browser_policy_connector.cc',
+        'browser/policy/browser_policy_connector.h',
         'browser/policy/cloud_policy_cache.cc',
         'browser/policy/cloud_policy_cache.h',
+        'browser/policy/cloud_policy_controller.cc',
+        'browser/policy/cloud_policy_controller.h',
+        'browser/policy/cloud_policy_identity_strategy.h',
+        'browser/policy/cloud_policy_subsystem.cc',
+        'browser/policy/cloud_policy_subsystem.h',
         'browser/policy/config_dir_policy_provider.cc',
         'browser/policy/config_dir_policy_provider.h',
         'browser/policy/configuration_policy_loader_win.cc',
@@ -1674,8 +1681,6 @@
         'browser/policy/configuration_policy_provider.h',
         'browser/policy/configuration_policy_provider_delegate_win.cc',
         'browser/policy/configuration_policy_provider_delegate_win.h',
-        'browser/policy/configuration_policy_provider_keeper.cc',
-        'browser/policy/configuration_policy_provider_keeper.h',
         'browser/policy/configuration_policy_provider_mac.cc',
         'browser/policy/configuration_policy_provider_mac.h',
         'browser/policy/configuration_policy_provider_win.cc',
@@ -1684,10 +1689,10 @@
         'browser/policy/device_management_backend.h',
         'browser/policy/device_management_backend_impl.cc',
         'browser/policy/device_management_backend_impl.h',
-        'browser/policy/device_management_policy_provider.cc',
-        'browser/policy/device_management_policy_provider.h',
         'browser/policy/device_management_service.cc',
         'browser/policy/device_management_service.h',
+        'browser/policy/device_policy_identity_strategy.cc',
+        'browser/policy/device_policy_identity_strategy.h',
         'browser/policy/device_token_fetcher.cc',
         'browser/policy/device_token_fetcher.h',
         'browser/policy/dummy_configuration_policy_provider.cc',
@@ -1698,8 +1703,10 @@
         'browser/policy/file_based_policy_provider.h',
         'browser/policy/managed_prefs_banner_base.cc',
         'browser/policy/managed_prefs_banner_base.h',
-        'browser/policy/profile_policy_context.cc',
-        'browser/policy/profile_policy_context.h',
+        'browser/policy/profile_policy_connector.cc',
+        'browser/policy/profile_policy_connector.h',
+        'browser/policy/user_policy_identity_strategy.cc',
+        'browser/policy/user_policy_identity_strategy.h',
         # TODO(danno): Find a better way to include these files
         '<(protoc_out_dir)/chrome/browser/policy/proto/device_management_backend.pb.cc',
         '<(protoc_out_dir)/chrome/browser/policy/proto/device_management_backend.pb.h',
@@ -3523,6 +3530,8 @@
             ['exclude', 'browser/extensions/extension_tts_api_chromeos.cc'],
             ['exclude', 'browser/oom_priority_manager.cc'],
             ['exclude', 'browser/oom_priority_manager.h'],
+            ['exclude', 'browser/policy/device_policy_identity_strategy.cc'],
+            ['exclude', 'browser/policy/device_policy_identity_strategy.h'],
             ['exclude', 'browser/renderer_host/offline_resource_handler.cc'],
             ['exclude', 'browser/renderer_host/offline_resource_handler.h'],
             ['exclude', 'browser/webui/filebrowse_ui.cc'],