Consolidate data storage and notifications in the cloud policy subsystem

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index fa1ac86133bb725ad46b8f9914874dab105e50f4..ddf64de3e072b03fb83b7fdcf1d0e2ad7e31aa7b 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1567,8 +1567,8 @@
         'browser/policy/cloud_policy_cache_base.h',
         'browser/policy/cloud_policy_controller.cc',
         'browser/policy/cloud_policy_controller.h',
-        'browser/policy/cloud_policy_identity_strategy.cc',
-        'browser/policy/cloud_policy_identity_strategy.h',
+        'browser/policy/cloud_policy_data_store.cc',
+        'browser/policy/cloud_policy_data_store.h',
         'browser/policy/cloud_policy_provider.cc',
         'browser/policy/cloud_policy_provider.h',
         'browser/policy/cloud_policy_provider_impl.cc',
@@ -1599,8 +1599,6 @@
         'browser/policy/device_management_service.h',
         'browser/policy/device_policy_cache.cc',
         'browser/policy/device_policy_cache.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_cloud_policy_provider.cc',
@@ -1625,8 +1623,6 @@
         'browser/policy/user_policy_cache.h',
         'browser/policy/user_policy_disk_cache.cc',
         'browser/policy/user_policy_disk_cache.h',
-        'browser/policy/user_policy_identity_strategy.cc',
-        'browser/policy/user_policy_identity_strategy.h',
         'browser/policy/user_policy_token_cache.cc',
         'browser/policy/user_policy_token_cache.h',
         # TODO(danno): Find a better way to include these files
@@ -3667,8 +3663,6 @@
             ['exclude', 'browser/policy/device_policy_cache.h'],
             ['exclude', 'browser/policy/enterprise_install_attributes.cc'],
             ['exclude', 'browser/policy/enterprise_install_attributes.h'],
-            ['exclude', 'browser/policy/device_policy_identity_strategy.cc'],
-            ['exclude', 'browser/policy/device_policy_identity_strategy.h'],
             ['exclude', 'browser/policy/proto/chrome_device_policy.pb.cc'],
             ['exclude', 'browser/policy/proto/chrome_device_policy.pb.h'],
             ['exclude', 'browser/renderer_host/offline_resource_handler.cc'],