Revert of Remove configuration policy from chrome build files. (patchset #4 id:60001 of https://codereview.chromium.org/1798273002/ )

Reason for revert:
Speculative revert: could have caused the Win8 GN build failures. See crbug.com/597032

Original issue's description:
> Remove configuration policy from chrome build files.
>
> The define was removed from src/chrome source files in https://codereview.chromium.org/1786263002/, this patch only touches the build files in src/chrome. Build updates outside of this directory will be updated in subsequent passes.
>
> BUG=594261
>
> Committed: https://crrev.com/db234c06ff6c308520594591fa54f80b08411888
> Cr-Commit-Position: refs/heads/master@{#382614}

TBR=atwilson@chromium.org,brettw@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=594261

Review URL: https://codereview.chromium.org/1818423003

Cr-Commit-Position: refs/heads/master@{#382681}

24 files changed, 462 insertions, 174 deletions

diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn
index 073f673..0594ea1 100644
--- a/chrome/BUILD.gn
+++ b/chrome/BUILD.gn
@@ -313,13 +313,15 @@ if (is_mac || is_win) {
         "//chrome/app/theme:chrome_unscaled_resources",
         "//chrome_elf",
         "//components/crash/content/app",
-        "//components/policy",
         "//content/app/resources",
         "//crypto",
         "//net:net_resources",
         "//third_party/wtl",
         "//ui/views",
       ]
+      if (enable_configuration_policy) {
+        deps += [ "//components/policy" ]
+      }
       if (current_cpu == "x86") {
         # TODO(GYP) bug 512861: Lots of VCLinkerTool stuff on Windows.
         #deps += [ 'chrome_user32_delay_imports' ]  TODO(GYP)
@@ -441,7 +443,9 @@ if (is_mac || is_win) {
         }
       }
 
-      deps += [ "//chrome/browser/policy:path_parser" ]
+      if (enable_configuration_policy) {
+        deps += [ "//chrome/browser/policy:path_parser" ]
+      }
 
       if (enable_plugins && enable_pdf) {
         deps += [ "//pdf" ]
diff --git a/chrome/android/BUILD.gn b/chrome/android/BUILD.gn
index c683640..fea9523 100644
--- a/chrome/android/BUILD.gn
+++ b/chrome/android/BUILD.gn
@@ -60,6 +60,9 @@ android_resources("chrome_java_resources") {
     "//third_party/android_data_chart:android_data_chart_java_resources",
     "//third_party/android_media:android_media_resources",
   ]
+  if (!enable_configuration_policy) {
+    deps -= [ "//components/policy:app_restrictions_resources" ]
+  }
   custom_package = "org.chromium.chrome"
 }
 
diff --git a/chrome/android/chrome_apk.gyp b/chrome/android/chrome_apk.gyp
index 8ca6c95..f14ae7d 100644
--- a/chrome/android/chrome_apk.gyp
+++ b/chrome/android/chrome_apk.gyp
@@ -162,6 +162,7 @@
         'jinja_output': '<(chrome_public_apk_manifest)',
         'jinja_variables': [
           'channel=<(android_channel)',
+          'configuration_policy=<(configuration_policy)',
           'manifest_package=<(manifest_package)',
           'min_sdk_version=16',
           'target_sdk_version=23',
@@ -178,6 +179,7 @@
         'jinja_output': '<(chrome_sync_shell_apk_manifest)',
         'jinja_variables': [
           'channel=<(android_channel)',
+          'configuration_policy=<(configuration_policy)',
           'manifest_package=<(sync_shell_manifest_package)',
           'min_sdk_version=16',
           'target_sdk_version=22',
diff --git a/chrome/android/chrome_public_apk_tmpl.gni b/chrome/android/chrome_public_apk_tmpl.gni
index 39bcaf3..04ddc8c 100644
--- a/chrome/android/chrome_public_apk_tmpl.gni
+++ b/chrome/android/chrome_public_apk_tmpl.gni
@@ -30,6 +30,11 @@ default_chrome_public_jinja_variables = [
   "channel=$android_channel",
   "enable_leakcanary=$enable_leakcanary",
 ]
+if (enable_configuration_policy) {
+  default_chrome_public_jinja_variables += [ "configuration_policy=1" ]
+} else {
+  default_chrome_public_jinja_variables += [ "configuration_policy=0" ]
+}
 
 # GYP: //chrome/android/chrome_apk.gypi
 template("chrome_public_apk_tmpl") {
diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml
index 7977a28..865541d 100644
--- a/chrome/android/java/AndroidManifest.xml
+++ b/chrome/android/java/AndroidManifest.xml
@@ -115,8 +115,10 @@ by a child template that "extends" this file.
         {% if channel in ['dev', 'canary', 'default'] %}
         <meta-data android:name="com.sec.android.support.multiwindow" android:value="true" />
         {% endif %}
+        {% if configuration_policy == '1' %}
         <meta-data android:name="android.content.APP_RESTRICTIONS"
             android:resource="@xml/app_restrictions"/>
+        {% endif %}
 
         <!-- Note: All activities directly or indirectly derived from ChromeActivity
              must specify android:hardwareAccelerated="false".
diff --git a/chrome/app/BUILD.gn b/chrome/app/BUILD.gn
index 92bb643..b3fc333 100644
--- a/chrome/app/BUILD.gn
+++ b/chrome/app/BUILD.gn
@@ -322,7 +322,6 @@ source_set("test_support") {
   deps = [
     "//base",
     "//chrome/browser",
-    "//chrome/browser/policy:path_parser",
     "//chrome/child",
     "//chrome/common",
     "//chrome/plugin",
@@ -353,6 +352,10 @@ source_set("test_support") {
     deps += [ "//chrome/browser/chromeos" ]
   }
 
+  if (enable_configuration_policy) {
+    deps += [ "//chrome/browser/policy:path_parser" ]
+  }
+
   if (enable_pdf) {
     deps += [ "//pdf" ]
   }
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 0bc2ce4..149156d 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -150,9 +150,7 @@ source_set("browser") {
     "//components/packed_ct_ev_whitelist",
     "//components/password_manager/core/browser",
     "//components/password_manager/core/common",
-    "//components/policy",
     "//components/policy:policy_component",
-    "//components/policy/proto",
     "//components/proxy_config",
     "//components/query_parser",
     "//components/rappor",
@@ -422,21 +420,17 @@ source_set("browser") {
   if (!is_win && !is_mac && !is_ios) {
     sources += [ "net/net_error_diagnostics_dialog_generic.cc" ]
   }
-  if (!is_android && !is_ios && !is_chromeos) {
+  if (!is_android && !is_ios && !is_chromeos && enable_configuration_policy) {
     sources += [
       "net/disk_cache_dir_policy_handler.cc",
       "net/disk_cache_dir_policy_handler.h",
     ]
   }
-  if (!is_android && !is_ios) {
+  if (!is_android && !is_ios && enable_configuration_policy) {
     sources += [
       "download/download_dir_policy_handler.cc",
       "download/download_dir_policy_handler.h",
     ]
-    deps += [
-      "//chrome/browser/policy:path_parser",
-      "//net:net_browser_services",
-    ]
   }
   if (is_mac) {
     sources +=
@@ -504,6 +498,48 @@ source_set("browser") {
     deps += [ "//components/nacl/browser" ]
   }
 
+  if (enable_configuration_policy) {
+    sources +=
+        rebase_path(gypi_values.chrome_browser_policy_shared_with_ios_sources,
+                    ".",
+                    "//chrome")
+    deps += [
+      "//components/policy",
+      "//components/policy/proto",
+    ]
+    if (!is_ios) {
+      sources += rebase_path(gypi_values.chrome_browser_policy_non_ios_sources,
+                             ".",
+                             "//chrome")
+    }
+    if (!is_chromeos) {
+      sources += rebase_path(
+              gypi_values.chrome_browser_policy_shared_with_ios_not_chromeos_sources,
+              ".",
+              "//chrome")
+    }
+    if (is_win || is_mac || is_desktop_linux) {
+      sources += rebase_path(gypi_values.chrome_browser_policy_desktop_sources,
+                             ".",
+                             "//chrome")
+    }
+    if (is_android || is_ios) {
+      sources += rebase_path(gypi_values.chrome_browser_policy_mobile_sources,
+                             ".",
+                             "//chrome")
+    } else {
+      deps += [
+        "//chrome/browser/policy:path_parser",
+        "//net:net_browser_services",
+      ]
+    }
+  } else {
+    # Configuration policy disabled.
+    sources += rebase_path(gypi_values.chrome_browser_policy_disabled_sources,
+                           ".",
+                           "//chrome")
+  }
+
   if (enable_plugins) {
     sources +=
         rebase_path(gypi_values.chrome_browser_plugins_sources, ".", "//chrome")
@@ -562,10 +598,6 @@ source_set("browser") {
                            ".",
                            "//chrome")
     deps += [ "//chrome/browser/chromeos" ]
-  } else {  # Non-ChromeOS.
-    sources += rebase_path(gypi_values.chrome_browser_non_chromeos_sources,
-                           ".",
-                           "//chrome")
   }
 
   if (is_chromeos || is_ios) {
diff --git a/chrome/browser/extensions/BUILD.gn b/chrome/browser/extensions/BUILD.gn
index 35aeeaa..a512418 100644
--- a/chrome/browser/extensions/BUILD.gn
+++ b/chrome/browser/extensions/BUILD.gn
@@ -47,7 +47,6 @@ source_set("extensions") {
     "//components/data_reduction_proxy/proto:data_reduction_proxy_proto",
     "//components/dom_distiller/core",
     "//components/onc",
-    "//components/policy",
     "//components/proximity_auth",
     "//components/resources",
     "//components/strings",
@@ -163,6 +162,17 @@ source_set("extensions") {
     }
   }
 
+  if (enable_configuration_policy) {
+    deps += [ "//components/policy" ]
+    sources += [
+      "policy_handlers.cc",
+      "policy_handlers.h",
+    ]
+    sources += rebase_path(gypi_values.chrome_browser_extensions_policy_sources,
+                           ".",
+                           "//chrome")
+  }
+
   if (enable_webrtc) {
     sources += [ "api/webrtc_logging_private/webrtc_logging_private_api.cc" ]
   } else {
diff --git a/chrome/browser/policy/BUILD.gn b/chrome/browser/policy/BUILD.gn
index 4f7ce16..d14578b 100644
--- a/chrome/browser/policy/BUILD.gn
+++ b/chrome/browser/policy/BUILD.gn
@@ -4,6 +4,8 @@
 
 import("//build/config/features.gni")
 
+assert(enable_configuration_policy)
+
 source_set("path_parser") {
   sources = [
     "policy_path_parser.h",
diff --git a/chrome/browser/policy/profile_policy_connector_stub.cc b/chrome/browser/policy/profile_policy_connector_stub.cc
new file mode 100644
index 0000000..39a1b36
--- /dev/null
+++ b/chrome/browser/policy/profile_policy_connector_stub.cc
@@ -0,0 +1,40 @@
+// Copyright (c) 2013 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.
+
+#include <utility>
+
+#include "chrome/browser/policy/profile_policy_connector.h"
+#include "components/policy/core/common/policy_service_stub.h"
+
+namespace policy {
+
+ProfilePolicyConnector::ProfilePolicyConnector() {}
+
+ProfilePolicyConnector::~ProfilePolicyConnector() {}
+
+void ProfilePolicyConnector::Init(
+    SchemaRegistry* schema_registry,
+    CloudPolicyManager* user_cloud_policy_manager) {
+  policy_service_.reset(new PolicyServiceStub());
+}
+
+void ProfilePolicyConnector::InitForTesting(scoped_ptr<PolicyService> service) {
+  policy_service_ = std::move(service);
+}
+
+void ProfilePolicyConnector::Shutdown() {}
+
+bool ProfilePolicyConnector::IsManaged() const {
+  return false;
+}
+
+std::string ProfilePolicyConnector::GetManagementDomain() const {
+  return "";
+}
+
+bool ProfilePolicyConnector::IsPolicyFromCloudPolicy(const char* name) const {
+  return false;
+}
+
+}  // namespace policy
diff --git a/chrome/browser/ui/BUILD.gn b/chrome/browser/ui/BUILD.gn
index 9b6799e..6618242 100644
--- a/chrome/browser/ui/BUILD.gn
+++ b/chrome/browser/ui/BUILD.gn
@@ -83,7 +83,6 @@ source_set("ui") {
     "//components/password_manager/content/browser",
     "//components/password_manager/core/browser",
     "//components/pdf/browser",
-    "//components/policy",
     "//components/pref_registry",
     "//components/proximity_auth",
     "//components/proxy_config",
@@ -220,6 +219,12 @@ source_set("ui") {
         rebase_path(gypi_values.chrome_browser_ui_nacl_sources, ".", "//chrome")
     deps += [ "//native_client/src/trusted/service_runtime:sel" ]
   }
+  if (enable_configuration_policy) {
+    sources += rebase_path(gypi_values.chrome_browser_ui_policy_sources,
+                           ".",
+                           "//chrome")
+    deps += [ "//components/policy" ]
+  }
   if (enable_plugins) {
     sources += rebase_path(gypi_values.chrome_browser_ui_plugin_sources,
                            ".",
diff --git a/chrome/chrome.gyp b/chrome/chrome.gyp
index 5252ae8..867d3a8 100644
--- a/chrome/chrome.gyp
+++ b/chrome/chrome.gyp
@@ -556,7 +556,6 @@
             '../base/base.gyp:base_build_config_gen',
             '../build/android/java_google_api_keys.gyp:google_api_keys_java',
             '../chrome/android/chrome_apk.gyp:custom_tabs_service_aidl',
-            '../components/components.gyp:app_restrictions_resources',
             '../components/components.gyp:autocomplete_match_java',
             '../components/components.gyp:autocomplete_match_type_java',
             '../components/components.gyp:bookmarks_java',
@@ -568,7 +567,6 @@
             '../components/components.gyp:navigation_interception_java',
             '../components/components.gyp:offline_page_feature_enums_java',
             '../components/components.gyp:offline_page_model_enums_java',
-            '../components/components.gyp:policy_java',
             '../components/components.gyp:precache_java',
             '../components/components.gyp:safe_json_java',
             '../components/components.gyp:security_state_enums_java',
@@ -620,6 +618,14 @@
               '<!@pymod_do_main(grit_info <@(grit_defines) --outputs "<(SHARED_INTERMEDIATE_DIR)/chrome" app/generated_resources.grd)',
             ],
           },
+          'conditions': [
+            ['configuration_policy == 1', {
+              'dependencies': [
+                '../components/components.gyp:app_restrictions_resources',
+                '../components/components.gyp:policy_java',
+              ],
+            }],
+          ],
           'includes': [
             '../build/java.gypi',
           ],
@@ -707,7 +713,7 @@
         'chrome_android.gypi',
       ]}, # 'includes'
     ],  # OS=="android"
-    ['OS!="android" and OS!="ios"', {
+    ['configuration_policy==1 and OS!="android" and OS!="ios"', {
       'includes': [ 'policy.gypi', ],
     }],
     ['enable_extensions==1', {
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index e8e18c2..e62207c 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -426,46 +426,6 @@
       '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',
@@ -1068,8 +1028,6 @@
     # 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',
@@ -1092,12 +1050,6 @@
       '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
@@ -1144,8 +1096,6 @@
     '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': [
@@ -2318,8 +2268,45 @@
       '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',
@@ -2327,6 +2314,42 @@
       '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',
@@ -3143,7 +3166,6 @@
         '../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',
@@ -3174,7 +3196,6 @@
         '../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',
@@ -3430,13 +3451,13 @@
             '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',
@@ -3464,8 +3485,6 @@
             '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': [
@@ -3531,6 +3550,35 @@
             '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',
@@ -3718,12 +3766,11 @@
         }],
         ['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',
           ]
         }],
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index d222f40..33c7dac 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -467,10 +467,6 @@
       'browser/extensions/api/signed_in_devices/signed_in_devices_manager.h',
       'browser/extensions/api/spellcheck/spellcheck_api.cc',
       'browser/extensions/api/spellcheck/spellcheck_api.h',
-      'browser/extensions/api/storage/managed_value_store_cache.cc',
-      'browser/extensions/api/storage/managed_value_store_cache.h',
-      'browser/extensions/api/storage/policy_value_store.cc',
-      'browser/extensions/api/storage/policy_value_store.h',
       'browser/extensions/api/storage/setting_sync_data.cc',
       'browser/extensions/api/storage/setting_sync_data.h',
       'browser/extensions/api/storage/settings_sync_processor.cc',
@@ -802,8 +798,6 @@
       'browser/extensions/permissions_updater.h',
       'browser/extensions/plugin_manager.cc',
       'browser/extensions/plugin_manager.h',
-      'browser/extensions/policy_handlers.cc',
-      'browser/extensions/policy_handlers.h',
       'browser/extensions/proxy_overridden_bubble_delegate.cc',
       'browser/extensions/proxy_overridden_bubble_delegate.h',
       'browser/extensions/scripting_permissions_modifier.cc',
@@ -924,6 +918,12 @@
       'browser/extensions/api/braille_display_private/brlapi_keycode_map.cc',
       'browser/extensions/api/braille_display_private/brlapi_keycode_map.h',
     ],
+    'chrome_browser_extensions_policy_sources': [
+      'browser/extensions/api/storage/managed_value_store_cache.cc',
+      'browser/extensions/api/storage/managed_value_store_cache.h',
+      'browser/extensions/api/storage/policy_value_store.cc',
+      'browser/extensions/api/storage/policy_value_store.h',
+    ],
     'chrome_browser_extensions_input_ime_linux_win_sources': [
       'browser/extensions/api/input_ime/input_ime_api.cc',
       'browser/extensions/api/input_ime/input_ime_api.h',
@@ -966,7 +966,6 @@
         '../components/components.gyp:copresence',
         '../components/components.gyp:dom_distiller_core',
         '../components/components.gyp:onc_component',
-        '../components/components.gyp:policy',
         '../components/components.gyp:proximity_auth',
         '../components/components.gyp:update_client',
         '../components/components.gyp:url_matcher',
@@ -1087,6 +1086,16 @@
             }],
           ],
         }],
+        ['configuration_policy==1', {
+          'dependencies': [
+            '../components/components.gyp:policy',
+          ],
+          'sources': [
+            'browser/extensions/policy_handlers.cc',
+            'browser/extensions/policy_handlers.h',
+            '<@(chrome_browser_extensions_policy_sources)',
+          ],
+        }],
         ['OS=="win" or OS=="mac"', {
           'dependencies': [
             '../components/components.gyp:wifi_component',
diff --git a/chrome/chrome_browser_ui.gypi b/chrome/chrome_browser_ui.gypi
index 3239cda..3048b61 100644
--- a/chrome/chrome_browser_ui.gypi
+++ b/chrome/chrome_browser_ui.gypi
@@ -366,12 +366,6 @@
       'browser/ui/webui/omnibox/omnibox_ui_handler.h',
       'browser/ui/webui/password_manager_internals/password_manager_internals_ui.cc',
       'browser/ui/webui/password_manager_internals/password_manager_internals_ui.h',
-      'browser/ui/webui/policy_material_design_ui.cc',
-      'browser/ui/webui/policy_material_design_ui.h',
-      'browser/ui/webui/policy_ui.cc',
-      'browser/ui/webui/policy_ui.h',
-      'browser/ui/webui/policy_ui_handler.cc',
-      'browser/ui/webui/policy_ui_handler.h',
       'browser/ui/webui/predictors/predictors_handler.cc',
       'browser/ui/webui/predictors/predictors_handler.h',
       'browser/ui/webui/predictors/predictors_ui.cc',
@@ -2821,6 +2815,14 @@
       'browser/ui/webui/plugins/plugins_ui.cc',
       'browser/ui/webui/plugins/plugins_ui.h',
     ],
+    'chrome_browser_ui_policy_sources': [
+      'browser/ui/webui/policy_material_design_ui.cc',
+      'browser/ui/webui/policy_material_design_ui.h',
+      'browser/ui/webui/policy_ui.cc',
+      'browser/ui/webui/policy_ui.h',
+      'browser/ui/webui/policy_ui_handler.cc',
+      'browser/ui/webui/policy_ui_handler.h',
+    ],
     'chrome_browser_ui_print_preview_sources': [
       'browser/ui/webui/print_preview/extension_printer_handler.cc',
       'browser/ui/webui/print_preview/extension_printer_handler.h',
@@ -2884,7 +2886,6 @@
         '../components/components.gyp:omnibox_common',
         '../components/components.gyp:onc_component',
         '../components/components.gyp:password_manager_core_browser',
-        '../components/components.gyp:policy',
         '../components/components.gyp:sync_driver',
         '../components/components.gyp:toolbar',
         '../components/components.gyp:ui_zoom',
@@ -2995,6 +2996,12 @@
             'DEBUG_DEVTOOLS=1',
           ],
         }],
+        ['configuration_policy==1', {
+          'sources': [ '<@(chrome_browser_ui_policy_sources)' ],
+          'dependencies': [
+            '../components/components.gyp:policy',
+          ],
+        }],
         ['enable_plugins==1', {
           'sources': [ '<@(chrome_browser_ui_plugin_sources)' ],
           'dependencies': [
diff --git a/chrome/chrome_common.gypi b/chrome/chrome_common.gypi
index b4733df..1f71565 100644
--- a/chrome/chrome_common.gypi
+++ b/chrome/chrome_common.gypi
@@ -332,7 +332,6 @@
         '<(DEPTH)/components/components.gyp:metrics',
         '<(DEPTH)/components/components.gyp:metrics_net',
         '<(DEPTH)/components/components.gyp:omnibox_common',
-        '<(DEPTH)/components/components.gyp:policy',
         '<(DEPTH)/components/components.gyp:policy_component_common',
         # TODO(fdoray): Remove this once the PreRead field trial has expired.
         # crbug.com/577698
@@ -517,6 +516,11 @@
             'common/media/webrtc_logging_messages.h',
           ]
         }],
+        ['configuration_policy==1', {
+          'dependencies': [
+            '<(DEPTH)/components/components.gyp:policy',
+          ],
+        }],
         ['safe_browsing==1', {
           'sources': [ '<@(chrome_common_full_safe_browsing_sources)', ],
         }],
diff --git a/chrome/chrome_dll.gypi b/chrome/chrome_dll.gypi
index a84463b..9ee23c53 100644
--- a/chrome/chrome_dll.gypi
+++ b/chrome/chrome_dll.gypi
@@ -122,13 +122,16 @@
           'dependencies': [
             '<@(chromium_browser_dependencies)',
             'chrome_features.gyp:chrome_common_features',
-            'policy_path_parser',
             '../content/content.gyp:content_app_browser',
           ],
           'conditions': [
             ['OS=="win"', {
               'dependencies': [
                 '<(DEPTH)/chrome_elf/chrome_elf.gyp:chrome_elf',
+              ],
+            }],
+            ['OS=="win" and configuration_policy==1', {
+              'dependencies': [
                 '<(DEPTH)/components/components.gyp:policy',
               ],
             }],
@@ -360,9 +363,6 @@
           ],
           'conditions': [
             ['OS=="win"', {
-              'dependencies': [
-                '<(DEPTH)/components/components.gyp:policy',
-              ],
               'conditions': [
                 ['chrome_pgo_phase!=0', {
                   # Disable Warning 4702 ("Unreachable code") for the WPO/PGO
@@ -399,6 +399,16 @@
                 }],
               ]
             }],
+            ['OS=="win" and configuration_policy==1', {
+              'dependencies': [
+                '<(DEPTH)/components/components.gyp:policy',
+              ],
+            }],
+            ['configuration_policy==1', {
+              'dependencies': [
+                'policy_path_parser',
+              ],
+            }],
             ['enable_plugins==1', {
               'dependencies': [
                 '../pdf/pdf.gyp:pdf',
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index 0c878b2e..58f70d3 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -418,7 +418,6 @@
             '../components/components.gyp:crash_component',
             '../components/components.gyp:crash_core_common',
             '../components/components.gyp:flags_ui_switches',
-            '../components/components.gyp:policy',
             '../components/components.gyp:startup_metric_utils_common',
             '../sandbox/sandbox.gyp:sandbox',
             '../third_party/kasko/kasko.gyp:kasko_features',
@@ -460,6 +459,13 @@
               ],
             },
           },
+          'conditions': [
+            ['configuration_policy==1', {
+              'dependencies': [
+                '<(DEPTH)/components/components.gyp:policy',
+              ],
+            }],
+          ],
           'actions': [
             {
               'action_name': 'first_run',
@@ -540,7 +546,6 @@
                 '../components/components.gyp:breakpad_win64',
                 '../components/components.gyp:crash_core_common_win64',
                 '../components/components.gyp:flags_ui_switches_win64',
-                '../components/components.gyp:policy_win64',
                 '../chrome/common_constants.gyp:common_constants_win64',
                 '../components/nacl.gyp:nacl_win64',
                 '../crypto/crypto.gyp:crypto_nacl_win64',
@@ -566,6 +571,13 @@
                   'msvs_target_platform': 'x64',
                 },
               },
+              'conditions': [
+                ['configuration_policy==1', {
+                  'dependencies': [
+                    '<(DEPTH)/components/components.gyp:policy_win64',
+                  ],
+                }],
+              ],
             },
           ],
         }, {  # else (disable_nacl==1)
diff --git a/chrome/chrome_process_finder.gypi b/chrome/chrome_process_finder.gypi
index c63ed82..26b4080 100644
--- a/chrome/chrome_process_finder.gypi
+++ b/chrome/chrome_process_finder.gypi
@@ -11,10 +11,16 @@
         '..',
       ],
       'dependencies': [
-        'policy_path_parser',
         '../base/base.gyp:base',
         '../chrome/common_constants.gyp:common_constants',
       ],
+      'conditions': [
+        ['configuration_policy==1', {
+          'dependencies': [
+            'policy_path_parser'
+          ],
+        }],
+      ],
       'sources': [
         'browser/chrome_process_finder_win.cc',
         'browser/chrome_process_finder_win.h',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index f43e2a8..a1434cd 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -367,16 +367,6 @@
       'browser/pdf/pdf_extension_test_util.cc',
       'browser/pdf/pdf_extension_test_util.h',
       'browser/plugins/plugin_power_saver_browsertest.cc',
-      'browser/policy/cloud/cloud_policy_browsertest.cc',
-      'browser/policy/cloud/cloud_policy_manager_browsertest.cc',
-      'browser/policy/cloud/component_cloud_policy_browsertest.cc',
-      'browser/policy/cloud/device_management_service_browsertest.cc',
-      'browser/policy/cloud/test_request_interceptor.cc',
-      'browser/policy/cloud/test_request_interceptor.h',
-      'browser/policy/policy_browsertest.cc',
-      'browser/policy/policy_network_browsertest.cc',
-      'browser/policy/policy_prefs_browsertest.cc',
-      'browser/policy/policy_startup_browsertest.cc',
       'browser/prefetch/prefetch_browsertest.cc',
       'browser/prefs/pref_functional_browsertest.cc',
       'browser/prefs/pref_service_browsertest.cc',
@@ -527,7 +517,6 @@
       'browser/ui/webui/net_internals/net_internals_ui_browsertest.cc',
       'browser/ui/webui/net_internals/net_internals_ui_browsertest.h',
       'browser/ui/webui/ntp/new_tab_ui_browsertest.cc',
-      'browser/ui/webui/options/certificate_manager_browsertest.cc',
       'browser/ui/webui/options/clear_browser_data_browsertest.cc',
       'browser/ui/webui/options/content_settings_exception_area_browsertest.cc',
       'browser/ui/webui/options/multilanguage_options_browsertest.cc',
@@ -535,10 +524,7 @@
       'browser/ui/webui/options/options_browsertest.cc',
       'browser/ui/webui/options/options_ui_browsertest.cc',
       'browser/ui/webui/options/options_ui_browsertest.h',
-      'browser/ui/webui/options/preferences_browsertest.cc',
-      'browser/ui/webui/options/preferences_browsertest.h',
       'browser/ui/webui/password_manager_internals/password_manager_internals_ui_browsertest.cc',
-      'browser/ui/webui/policy_ui_browsertest.cc',
       'browser/ui/webui/print_preview/print_preview_ui_browsertest.cc',
       'browser/ui/webui/signin/inline_login_ui_browsertest.cc',
       'browser/ui/webui/signin/user_manager_ui_browsertest.cc',
@@ -860,6 +846,22 @@
       # This should be brought up on OSX Views but not CrOS.
       'browser/ui/views/profiles/profile_chooser_view_browsertest.cc',
     ],
+    'chrome_browser_tests_policy_sources': [
+      'browser/policy/cloud/cloud_policy_browsertest.cc',
+      'browser/policy/cloud/cloud_policy_manager_browsertest.cc',
+      'browser/policy/cloud/component_cloud_policy_browsertest.cc',
+      'browser/policy/cloud/device_management_service_browsertest.cc',
+      'browser/policy/cloud/test_request_interceptor.cc',
+      'browser/policy/cloud/test_request_interceptor.h',
+      'browser/policy/policy_browsertest.cc',
+      'browser/policy/policy_network_browsertest.cc',
+      'browser/policy/policy_prefs_browsertest.cc',
+      'browser/policy/policy_startup_browsertest.cc',
+      'browser/ui/webui/options/certificate_manager_browsertest.cc',
+      'browser/ui/webui/options/preferences_browsertest.cc',
+      'browser/ui/webui/options/preferences_browsertest.h',
+      'browser/ui/webui/policy_ui_browsertest.cc',
+    ],
     'chrome_browser_tests_speech_sources': [
       'browser/speech/extension_api/tts_extension_apitest.cc',
       'browser/speech/speech_recognition_browsertest.cc',
@@ -2398,11 +2400,10 @@
             'browser/ui/webui/signin/user_manager_ui_browsertest.cc',
           ],
           'dependencies': [
+            '../dbus/dbus.gyp:dbus_test_support',
             '../build/linux/system.gyp:dbus',
             '../chromeos/ime/input_method.gyp:gencode',
-            '../components/components.gyp:arc_test_support',
             '../components/components.gyp:drive_test_support',
-            '../dbus/dbus.gyp:dbus_test_support',
             '../ui/login/login.gyp:login_resources',
           ],
         }, {  # Non-ChromeOS
@@ -2429,6 +2430,16 @@
             }],
           ]
         }],
+        ['configuration_policy==1', {
+          'sources': [ '<@(chrome_browser_tests_policy_sources)' ],
+          'conditions': [
+            ['chromeos==1', {
+              'dependencies': [
+                '../components/components.gyp:arc_test_support',
+              ]
+            }]
+          ]
+        }],
         ['enable_web_speech==1', {
           'sources': [ '<@(chrome_browser_tests_speech_sources)' ],
         }],
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 2ad37aa..42e5e02 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -167,14 +167,6 @@
       'browser/permissions/chooser_context_base_unittest.cc',
       'browser/permissions/permission_context_base_unittest.cc',
       'browser/permissions/permission_manager_unittest.cc',
-      'browser/policy/cloud/cloud_policy_invalidator_unittest.cc',
-      'browser/policy/cloud/remote_commands_invalidator_unittest.cc',
-      'browser/policy/cloud/user_policy_signin_service_unittest.cc',
-      'browser/policy/file_selection_dialogs_policy_handler_unittest.cc',
-      'browser/policy/javascript_policy_handler_unittest.cc',
-      'browser/policy/managed_bookmarks_policy_handler_unittest.cc',
-      'browser/policy/policy_path_parser_unittest.cc',
-      'browser/policy/profile_policy_connector_unittest.cc',
       'browser/predictors/autocomplete_action_predictor_table_unittest.cc',
       'browser/predictors/autocomplete_action_predictor_unittest.cc',
       'browser/predictors/resource_prefetch_common_unittest.cc',
@@ -186,7 +178,6 @@
       'browser/prefs/command_line_pref_store_ssl_manager_unittest.cc',
       'browser/prefs/command_line_pref_store_unittest.cc',
       'browser/prefs/incognito_mode_prefs_unittest.cc',
-      'browser/prefs/proxy_policy_unittest.cc',
       'browser/prefs/profile_pref_store_manager_unittest.cc',
       'browser/prefs/session_startup_pref_unittest.cc',
       'browser/prerender/prerender_history_unittest.cc',
@@ -197,7 +188,6 @@
       'browser/process_info_snapshot_mac_unittest.cc',
       'browser/process_singleton_win_unittest.cc',
       'browser/profiles/gaia_info_update_service_unittest.cc',
-      'browser/profiles/incognito_mode_policy_handler_unittest.cc',
       'browser/profiles/profile_attributes_storage_unittest.cc',
       'browser/profiles/profile_avatar_icon_util_unittest.cc',
       'browser/profiles/profile_downloader_unittest.cc',
@@ -228,7 +218,6 @@
       'browser/services/gcm/fake_gcm_profile_service.h',
       'browser/services/gcm/fake_signin_manager.cc',
       'browser/services/gcm/fake_signin_manager.h',
-      'browser/sessions/restore_on_startup_policy_handler_unittest.cc',
       'browser/shell_integration_win_unittest.cc',
       'browser/signin/account_reconcilor_unittest.cc',
       'browser/signin/chrome_signin_client_unittest.cc',
@@ -341,7 +330,6 @@
       'browser/permissions/permission_queue_controller_unittest.cc',
     ],
     'chrome_unit_tests_non_mobile_sources': [
-      'browser/download/download_dir_policy_handler_unittest.cc',
       'browser/lifetime/keep_alive_registry_unittest.cc',
       'browser/renderer_context_menu/render_view_context_menu_test_util.cc',
       'browser/renderer_context_menu/render_view_context_menu_test_util.h',
@@ -458,7 +446,6 @@
       'browser/extensions/api/socket/tls_socket_unittest.cc',
       'browser/extensions/api/socket/udp_socket_unittest.cc',
       'browser/extensions/api/sockets_tcp_server/sockets_tcp_server_api_unittest.cc',
-      'browser/extensions/api/storage/policy_value_store_unittest.cc',
       'browser/extensions/api/storage/settings_sync_unittest.cc',
       'browser/extensions/api/streams_private/streams_private_manifest_unittest.cc',
       'browser/extensions/api/tabs/tabs_api_unittest.cc',
@@ -529,7 +516,6 @@
       'browser/extensions/permission_messages_unittest.cc',
       'browser/extensions/permissions_based_management_policy_provider_unittest.cc',
       'browser/extensions/permissions_updater_unittest.cc',
-      'browser/extensions/policy_handlers_unittest.cc',
       'browser/extensions/scripting_permissions_modifier_unittest.cc',
       'browser/extensions/shared_module_service_unittest.cc',
       'browser/extensions/standard_management_policy_provider_unittest.cc',
@@ -732,6 +718,24 @@
       'browser/printing/cloud_print/privet_notifications_unittest.cc',
       'browser/printing/cloud_print/privet_url_fetcher_unittest.cc',
     ],
+    'chrome_unit_tests_configuration_policy_sources': [
+      'browser/policy/cloud/cloud_policy_invalidator_unittest.cc',
+      'browser/policy/cloud/remote_commands_invalidator_unittest.cc',
+      'browser/policy/cloud/user_policy_signin_service_unittest.cc',
+      'browser/policy/file_selection_dialogs_policy_handler_unittest.cc',
+      'browser/policy/javascript_policy_handler_unittest.cc',
+      'browser/policy/managed_bookmarks_policy_handler_unittest.cc',
+      'browser/policy/policy_path_parser_unittest.cc',
+      'browser/policy/profile_policy_connector_unittest.cc',
+      'browser/prefs/proxy_policy_unittest.cc',
+      'browser/profiles/incognito_mode_policy_handler_unittest.cc',
+      'browser/sessions/restore_on_startup_policy_handler_unittest.cc',
+    ],
+    # This is extensions && policy sources.
+    'chrome_unit_tests_extensions_policy_sources': [
+      'browser/extensions/api/storage/policy_value_store_unittest.cc',
+      'browser/extensions/policy_handlers_unittest.cc',
+    ],
     'chrome_unit_tests_speech_sources': [
       'browser/speech/extension_api/extension_manifests_tts_unittest.cc',
       'browser/speech/tts_controller_unittest.cc',
@@ -1673,8 +1677,6 @@
         '../components/components.gyp:offline_pages_test_support',
         '../components/components.gyp:omnibox_test_support',
         '../components/components.gyp:password_manager_core_browser_test_support',
-        '../components/components.gyp:policy_component_test_support',
-        '../components/components.gyp:policy_test_support',
         '../components/components.gyp:pref_registry_test_support',
         '../components/components.gyp:rappor_test_support',
         '../components/components.gyp:search_engines_test_support',
@@ -1703,8 +1705,6 @@
       ],
       'export_dependent_settings': [
         '../base/base.gyp:test_support_base',
-        '../components/components.gyp:policy_component_test_support',
-        '../components/components.gyp:policy_test_support',
         '../content/content_shell_and_tests.gyp:test_support_content',
       ],
       'include_dirs': [
@@ -1747,8 +1747,6 @@
         'browser/net/url_request_mock_util.h',
         'browser/notifications/notification_test_util.cc',
         'browser/notifications/notification_test_util.h',
-        'browser/policy/test/local_policy_test_server.cc',
-        'browser/policy/test/local_policy_test_server.h',
         'browser/profile_resetter/profile_resetter_test_base.cc',
         'browser/profile_resetter/profile_resetter_test_base.h',
         'browser/search_engines/template_url_service_factory_test_util.cc',
@@ -2005,6 +2003,20 @@
             '../ui/aura/aura.gyp:aura_test_support',
           ],
         }],
+        ['configuration_policy==1', {
+          'dependencies': [
+            '../components/components.gyp:policy_component_test_support',
+            '../components/components.gyp:policy_test_support',
+          ],
+          'export_dependent_settings': [
+            '../components/components.gyp:policy_component_test_support',
+            '../components/components.gyp:policy_test_support',
+          ],
+          'sources': [
+            'browser/policy/test/local_policy_test_server.cc',
+            'browser/policy/test/local_policy_test_server.h',
+          ],
+        }],
         ['safe_browsing==1', {
           'sources': [
             'browser/extensions/fake_safe_browsing_database_manager.cc',
@@ -2291,9 +2303,6 @@
         }],
         ['OS=="android"', {
           'sources': [ '<@(chrome_unit_tests_offline_pages_sources)' ],
-          'sources!': [
-            'browser/policy/policy_path_parser_unittest.cc',
-          ],
           'dependencies!': [
             '../third_party/libaddressinput/libaddressinput.gyp:libaddressinput',
           ],
@@ -2331,7 +2340,6 @@
         ['chromeos==1', {
           'sources!': [
             'browser/signin/chrome_signin_status_metrics_provider_delegate_unittest.cc',
-            'browser/policy/cloud/user_policy_signin_service_unittest.cc',
           ],
         }],
         ['enable_background==1', {
@@ -2368,6 +2376,9 @@
             '../extensions/extensions_strings.gyp:extensions_strings',
           ],
           'conditions': [
+            ['configuration_policy==1', {
+              'sources': [ '<@(chrome_unit_tests_extensions_policy_sources)' ],
+            }],
             ['enable_service_discovery==1', {
               'sources': [ '<@(chrome_unit_tests_extensions_service_discovery_sources)' ],
             }],
@@ -2408,7 +2419,6 @@
         }],
         ['OS!="android" and OS!="ios" and chromeos==0', {
           'sources': [
-            'browser/net/disk_cache_dir_policy_handler_unittest.cc',
             'browser/profiles/profile_list_desktop_unittest.cc',
             'browser/profiles/profile_statistics_unittest.cc',
           ],
@@ -2434,6 +2444,31 @@
         ['enable_service_discovery==1', {
           'sources': [ '<@(chrome_unit_tests_service_discovery_sources)' ],
         }],
+        ['configuration_policy==1', {
+          'sources': [ '<@(chrome_unit_tests_configuration_policy_sources)' ],
+          'conditions': [
+            ['chromeos==1', {
+              'sources!': [
+                'browser/policy/cloud/user_policy_signin_service_unittest.cc',
+              ],
+            }],
+            ['OS=="android"', {
+              'sources!': [
+                'browser/policy/policy_path_parser_unittest.cc',
+              ],
+            }],
+            ['OS!="android" and OS!="ios" and chromeos==0', {
+              'sources': [
+                'browser/net/disk_cache_dir_policy_handler_unittest.cc',
+              ],
+            }],
+            ['OS!="android" and OS!="ios"', {
+              'sources': [
+                'browser/download/download_dir_policy_handler_unittest.cc'
+              ],
+            }],
+          ],
+        }],
         ['enable_web_speech==1', {
           'sources': [ '<@(chrome_unit_tests_speech_sources)' ],
         }],
diff --git a/chrome/common/BUILD.gn b/chrome/common/BUILD.gn
index 511f736..d1cc2cd 100644
--- a/chrome/common/BUILD.gn
+++ b/chrome/common/BUILD.gn
@@ -89,7 +89,6 @@ static_library("common") {
     "//components/nacl/common:switches",
     "//components/offline_pages:switches",
     "//components/omnibox/common",
-    "//components/policy",
     "//components/policy:policy_component_common",
     "//components/prefs",
     "//components/strings",
@@ -272,6 +271,9 @@ static_library("common") {
   if (!enable_webrtc) {
     sources -= [ "media/webrtc_logging_messages.h" ]
   }
+  if (enable_configuration_policy) {
+    public_deps += [ "//components/policy" ]
+  }
 
   if (safe_browsing_mode == 1) {
     sources += rebase_path(gypi_values.chrome_common_full_safe_browsing_sources,
diff --git a/chrome/policy.gypi b/chrome/policy.gypi
index 6d81c9c..656838a 100644
--- a/chrome/policy.gypi
+++ b/chrome/policy.gypi
@@ -3,25 +3,29 @@
 # found in the LICENSE file.
 
 {
-  'targets': [
-    {
-      # GN version: //chrome/browser/policy:path_parser
-      'target_name': 'policy_path_parser',
-      'type': 'static_library',
-      'dependencies': [
-        '../base/base.gyp:base',
-        '../chrome/common_constants.gyp:common_constants',
-        '../components/components.gyp:policy',
+  'conditions': [
+    ['configuration_policy==1', {
+      'targets': [
+        {
+          # GN version: //chrome/browser/policy:path_parser
+          'target_name': 'policy_path_parser',
+          'type': 'static_library',
+          'dependencies': [
+            '../base/base.gyp:base',
+            '../chrome/common_constants.gyp:common_constants',
+            '../components/components.gyp:policy',
+          ],
+          'include_dirs': [
+            '..',
+          ],
+          'sources': [
+            '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_win.cc',
+          ],
+        },
       ],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        '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_win.cc',
-      ],
-    },
+    }],
   ],
 }
diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn
index 0202cff..cdb61db 100644
--- a/chrome/test/BUILD.gn
+++ b/chrome/test/BUILD.gn
@@ -1046,7 +1046,6 @@ if (!is_android) {
       ]
       deps += [
         "//chromeos/ime:gencode",
-        "//components/arc:arc_test_support",
         "//components/user_manager:test_support",
         "//dbus",
         "//dbus:test_support",
@@ -1069,6 +1068,15 @@ if (!is_android) {
         sources -= [ "../browser/ui/views/select_file_dialog_extension_browsertest.cc" ]
       }
     }
+    if (enable_configuration_policy) {
+      sources += rebase_path(
+              chrome_tests_gypi_values.chrome_browser_tests_policy_sources,
+              ".",
+              "//chrome")
+      if (is_chromeos) {
+        deps += [ "//components/arc:arc_test_support" ]
+      }
+    }
     if (enable_web_speech) {
       sources += rebase_path(
               chrome_tests_gypi_values.chrome_browser_tests_speech_sources,
@@ -1638,7 +1646,6 @@ test("unit_tests") {
             chrome_tests_unit_gypi_values.chrome_unit_tests_offline_pages_sources,
             ".",
             "//chrome")
-    sources -= [ "../browser/policy/policy_path_parser_unittest.cc" ]
     deps += [
       ":unit_tests_java",
       "//components/offline_pages:test_support",
@@ -1665,10 +1672,7 @@ test("unit_tests") {
   }
 
   if (!is_ios && !is_android) {
-    deps += [
-      ":unit_tests_js",
-      "//components/bubble:test_support",
-    ]
+    deps += [ ":unit_tests_js" ]
     sources += rebase_path(
             chrome_tests_unit_gypi_values.chrome_unit_tests_non_mobile_sources,
             ".",
@@ -1726,6 +1730,12 @@ test("unit_tests") {
       "//extensions:extensions_resources",
       "//extensions/strings",
     ]
+    if (enable_configuration_policy) {
+      sources += rebase_path(
+              chrome_tests_unit_gypi_values.chrome_unit_tests_extensions_policy_sources,
+              ".",
+              "//chrome")
+    }
     if (enable_service_discovery) {
       sources += rebase_path(
               chrome_tests_unit_gypi_values.chrome_unit_tests_extensions_service_discovery_sources,
@@ -1771,7 +1781,6 @@ test("unit_tests") {
   }
   if (!is_android && !is_ios && !is_chromeos) {
     sources += [
-      "../browser/net/disk_cache_dir_policy_handler_unittest.cc",
       "//chrome/browser/profiles/profile_list_desktop_unittest.cc",
       "//chrome/browser/profiles/profile_statistics_unittest.cc",
     ]
@@ -1801,6 +1810,27 @@ test("unit_tests") {
             ".",
             "//chrome")
   }
+  if (enable_configuration_policy) {
+    sources += rebase_path(
+            chrome_tests_unit_gypi_values.chrome_unit_tests_configuration_policy_sources,
+            ".",
+            "//chrome")
+    if (is_chromeos) {
+      sources -=
+          [ "../browser/policy/cloud/user_policy_signin_service_unittest.cc" ]
+    } else if (is_android) {
+      sources -= [ "../browser/policy/policy_path_parser_unittest.cc" ]
+    }
+    if (!is_android && !is_ios && !is_chromeos) {
+      sources += [ "../browser/net/disk_cache_dir_policy_handler_unittest.cc" ]
+    }
+    if (!is_android && !is_ios) {
+      sources +=
+          [ "../browser/download/download_dir_policy_handler_unittest.cc" ]
+
+      deps += [ "//components/bubble:test_support" ]
+    }
+  }
   if (enable_web_speech) {
     sources += rebase_path(
             chrome_tests_unit_gypi_values.chrome_unit_tests_speech_sources,
@@ -1887,10 +1917,7 @@ test("unit_tests") {
       "//chrome/browser/chromeos:unit_tests",
       "//chromeos/ime:gencode",
     ]
-    sources -= [
-      "../browser/policy/cloud/user_policy_signin_service_unittest.cc",
-      "../browser/signin/signin_manager_unittest.cc",
-    ]
+    sources -= [ "../browser/signin/signin_manager_unittest.cc" ]
   }
   if (use_x11) {
     deps += [ "//ui/events/devices" ]