Remove enable_configuration_policy build define.

android_webview/BUILD.gn

 # Copyright 2015 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("//android_webview/system_webview_apk_tmpl.gni")
 import("//android_webview/webview_repack_locales.gni")
 import("//build/config/android/config.gni")
 import("//build/config/android/rules.gni")
 import("//build/config/locales.gni")
 import("//components/spellcheck/spellcheck_build_features.gni")
@@ skipping 468 matching lines @@
     "//components/cdm/browser",
     "//components/cdm/renderer",
     "//components/crash/content/app",
     "//components/crash/content/browser",
     "//components/metrics",
     "//components/metrics:gpu",
     "//components/metrics:net",
     "//components/metrics:profiler",
     "//components/metrics:ui",
     "//components/navigation_interception",
+    "//components/policy:generated",
+    "//components/policy/core/browser",
     "//components/prefs",
     "//components/printing/browser",
     "//components/printing/common",
     "//components/printing/renderer",
     "//components/spellcheck:build_features",
     "//components/supervised_user_error_page",
     "//components/supervised_user_error_page:gin",
     "//components/version_info",
     "//components/visitedlink/browser",
     "//components/visitedlink/renderer",
@@ skipping 18 matching lines @@
     "//services/service_manager/public/cpp",
     "//skia",
     "//third_party/WebKit/public:blink",
     "//ui/events:gesture_detection",
     "//ui/gl",
     "//ui/gl/init",
     "//ui/shell_dialogs",
     "//v8",
   ]
 
-  if (enable_configuration_policy) {
-    deps += [
-      "//components/policy:generated",
-      "//components/policy/core/browser",
-    ]
-  }
-
   if (enable_spellcheck) {
     deps += [
       "//components/spellcheck/browser",
       "//components/spellcheck/renderer",
     ]
   }
 
   configs += [ "//v8:external_startup_data" ]
 }
 
@@ skipping 64 matching lines @@
     "java/src/org/chromium/android_webview/permission/AwGeolocationCallback.java",
     "java/src/org/chromium/android_webview/permission/AwPermissionRequest.java",
     "java/src/org/chromium/android_webview/policy/AwPolicyProvider.java",
   ]
   deps = [
     ":resources",
     ":strings_grd",
     "//base:base_java",
     "//components/autofill/android:autofill_java",
     "//components/navigation_interception/android:navigation_interception_java",
+    "//components/policy/android:policy_java",
     "//components/web_contents_delegate_android:web_contents_delegate_android_java",
     "//components/web_restrictions:web_restrictions_java",
     "//content/public/android:content_java",
     "//device/geolocation:geolocation_java",
     "//net/android:net_java",
     "//third_party/android_tools:android_support_annotations_java",
     "//ui/android:ui_java",
     google_play_services_library,
     google_play_services_resources,
   ]
 
-  if (enable_configuration_policy) {
-    deps += [ "//components/policy/android:policy_java" ]
-  }
-
   if (enable_spellcheck) {
     deps += [ "//components/spellcheck/browser/android:java" ]
   }
 
   srcjar_deps = [ "//android_webview/native:aw_permission_request_resource" ]
 }
 
 java_strings_grd("strings_grd") {
   grd_file = "java/strings/android_webview_strings.grd"
   outputs = [
@@ skipping 48 matching lines @@
   system_webview_apk_tmpl("system_webview_apk") {
     android_manifest = system_webview_android_manifest
     android_manifest_dep = ":system_webview_manifest"
     deps = [
       ":system_webview_resources",
       "//android_webview/glue",
     ]
     apk_name = "SystemWebView"
   }
 }