Revert of Remove configuration policy from chrome build files.

chrome/browser/BUILD.gn

Index: chrome/browser/BUILD.gn
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 0bc2ce4bcea8e110f02f551e7d9a4f1056f08235..149156da66ae62f1123d49f48a1cc49906a4dc73 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -150,9 +150,7 @@
     "//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,20 +420,16 @@
   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) {
@@ -502,6 +496,48 @@
     sources +=
         rebase_path(gypi_values.chrome_browser_nacl_sources, ".", "//chrome")
     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) {
@@ -562,10 +598,6 @@
                            ".",
                            "//chrome")
     deps += [ "//chrome/browser/chromeos" ]
-  } else {  # Non-ChromeOS.
-    sources += rebase_path(gypi_values.chrome_browser_non_chromeos_sources,
-                           ".",
-                           "//chrome")
   }
 
   if (is_chromeos || is_ios) {