Revert of Remove configuration policy from chrome build files.

chrome/browser/BUILD.gn

 # Copyright 2014 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.
 
 import("//build/config/chrome_build.gni")
 import("//build/config/crypto.gni")
 import("//build/config/features.gni")
 import("//build/config/ui.gni")
 import("//chrome/common/features.gni")
 import("//media/media_options.gni")
@@ skipping 132 matching lines @@
     "//components/mime_util",
     "//components/navigation_metrics",
     "//components/network_time",
     "//components/ntp_snippets",
     "//components/offline_pages",
     "//components/omnibox/browser",
     "//components/os_crypt",
     "//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",
     "//components/renderer_context_menu",
     "//components/search",
     "//components/search_engines",
     "//components/search_provider_logos",
     "//components/security_interstitials/core",
     "//components/security_state",
     "//components/signin/core/browser",
@@ skipping 249 matching lines @@
     ]
   }
 
   if (is_win || is_mac) {
     sources +=
         rebase_path(gypi_values.chrome_browser_win_mac_sources, ".", "//chrome")
   }
   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 +=
         rebase_path(gypi_values.chrome_browser_mac_sources, ".", "//chrome")
     deps += [
       "//chrome/app_shim",
       "//chrome/browser/apps/app_shim",
     ]
   }
   if (is_win) {
@@ skipping 47 matching lines @@
     if (!is_android) {
       deps += [ "//third_party/hunspell" ]
     }
   }
   if (enable_nacl) {
     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) {
     sources +=
         rebase_path(gypi_values.chrome_browser_plugins_sources, ".", "//chrome")
     deps += [
       "//components/pdf/browser",
       "//ppapi/proxy:ipc",
       "//third_party/adobe/flash:flapper_version_h",
     ]
   }
   if (safe_browsing_mode != 0) {
@@ skipping 38 matching lines @@
 
   if (is_linux && !is_chromeos) {
     deps += [ "//third_party/speech-dispatcher" ]
   }
 
   if (is_chromeos) {
     sources += rebase_path(gypi_values.chrome_browser_chromeos_sources,
                            ".",
                            "//chrome")
     deps += [ "//chrome/browser/chromeos" ]
-  } else {  # Non-ChromeOS.
-    sources += rebase_path(gypi_values.chrome_browser_non_chromeos_sources,
-                           ".",
-                           "//chrome")
   }
 
   if (is_chromeos || is_ios) {
     sources -= [
       "signin/chrome_signin_status_metrics_provider_delegate.cc",
       "signin/chrome_signin_status_metrics_provider_delegate.h",
     ]
   }
 
   if (is_chromeos) {
@@ skipping 746 matching lines @@
         rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome")
     deps = [
       "//components/google/core/browser",
       "//components/omnibox/browser",
       "//components/rlz",
       "//components/search_engines",
       "//rlz:rlz_lib",
     ]
   }
 }