More fixes to enable ios build with policy.

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index c67c63ebf14ded6aeb5991530574728facfee151..f340515a3f4fdc43e6b8d60408dd779cb4867c81 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -2796,26 +2796,54 @@
                 'policy_path_parser',
               ],
             }],
+            ['OS=="ios"', {
+              # Explicitly add the browser/policy files that should be included
+              # on iOS builds.
+              'sources/': [
+                ['include', '^browser/policy/cloud/cloud_policy_invalidator.cc'],
+                ['include', '^browser/policy/cloud/cloud_policy_invalidator.h'],
+                ['include', '^browser/policy/cloud/policy_header_service_factory.cc'],
+                ['include', '^browser/policy/cloud/policy_header_service_factory.h'],
+                ['include', '^browser/policy/cloud/user_cloud_policy_invalidator.cc'],
+                ['include', '^browser/policy/cloud/user_cloud_policy_invalidator.h'],
+                ['include', '^browser/policy/cloud/user_cloud_policy_invalidator_factory.cc'],
+                ['include', '^browser/policy/cloud/user_cloud_policy_invalidator_factory.h'],
+                ['include', '^browser/policy/cloud/user_cloud_policy_manager_factory.cc'],
+                ['include', '^browser/policy/cloud/user_cloud_policy_manager_factory.h'],
+                ['include', '^browser/policy/configuration_policy_handler_list_factory.cc'],
+                ['include', '^browser/policy/configuration_policy_handler_list_factory.h'],
+                ['include', '^browser/policy/policy_helpers.cc'],
+                ['include', '^browser/policy/policy_helpers.h'],
+                ['include', '^browser/policy/profile_policy_connector.cc'],
+                ['include', '^browser/policy/profile_policy_connector.h'],
+                ['include', '^browser/policy/profile_policy_connector_factory.cc'],
+                ['include', '^browser/policy/profile_policy_connector_factory.h'],
+                ['include', '^browser/policy/schema_registry_service.cc'],
+                ['include', '^browser/policy/schema_registry_service.h'],
+                ['include', '^browser/policy/schema_registry_service_factory.cc'],
+                ['include', '^browser/policy/schema_registry_service_factory.h'],
+              ],
+            }],
           ],
         }, {  # configuration_policy==0
           'sources/': [
             ['exclude', '^browser/policy/'],
-            ['exclude', 'browser/net/disk_cache_dir_policy_handler.cc'],
-            ['exclude', 'browser/net/disk_cache_dir_policy_handler.h'],
-            ['exclude', 'browser/net/proxy_policy_handler.cc'],
-            ['exclude', 'browser/net/proxy_policy_handler.h'],
-            ['exclude', 'browser/profiles/incognito_mode_policy_handler.cc'],
-            ['exclude', 'browser/profiles/incognito_mode_policy_handler.h'],
-            ['exclude', 'browser/search_engines/default_search_policy_handler.cc'],
-            ['exclude', 'browser/search_engines/default_search_policy_handler.h'],
-            ['exclude', 'browser/sessions/restore_on_startup_policy_handler.cc'],
-            ['exclude', 'browser/sessions/restore_on_startup_policy_handler.h'],
-            ['exclude', 'browser/sync/sync_policy_handler.cc'],
-            ['exclude', 'browser/sync/sync_policy_handler.h'],
-            ['include', 'browser/policy/profile_policy_connector_stub.cc'],
-            ['include', 'browser/policy/profile_policy_connector.h'],
-            ['include', 'browser/policy/profile_policy_connector_factory.cc'],
-            ['include', 'browser/policy/profile_policy_connector_factory.h'],
+            ['exclude', '^browser/net/disk_cache_dir_policy_handler.cc'],
+            ['exclude', '^browser/net/disk_cache_dir_policy_handler.h'],
+            ['exclude', '^browser/net/proxy_policy_handler.cc'],
+            ['exclude', '^browser/net/proxy_policy_handler.h'],
+            ['exclude', '^browser/profiles/incognito_mode_policy_handler.cc'],
+            ['exclude', '^browser/profiles/incognito_mode_policy_handler.h'],
+            ['exclude', '^browser/search_engines/default_search_policy_handler.cc'],
+            ['exclude', '^browser/search_engines/default_search_policy_handler.h'],
+            ['exclude', '^browser/sessions/restore_on_startup_policy_handler.cc'],
+            ['exclude', '^browser/sessions/restore_on_startup_policy_handler.h'],
+            ['exclude', '^browser/sync/sync_policy_handler.cc'],
+            ['exclude', '^browser/sync/sync_policy_handler.h'],
+            ['include', '^browser/policy/profile_policy_connector_stub.cc'],
+            ['include', '^browser/policy/profile_policy_connector.h'],
+            ['include', '^browser/policy/profile_policy_connector_factory.cc'],
+            ['include', '^browser/policy/profile_policy_connector_factory.h'],
           ],
         }],
         ['enable_plugins==1', {