Remove enable_configuration_policy build define.
This build flag is always set for non-iOS platforms. The flag is not
overridable in the build and we never test other settings of it. The policy
code is stable and doesn't change.
This patch removes the flag and replaces it with !ios conditionals.
BUG=671706
Review-Url: https://codereview.chromium.org/2558043004
Cr-Commit-Position: refs/heads/master@{#437759}
diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index a879ebd3..4bad36d 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -4063,11 +4063,9 @@
]
deps = [
"//base",
+ "//chrome/browser/policy:path_parser",
"//chrome/common:constants",
]
- if (enable_configuration_policy) {
- deps += [ "//chrome/browser/policy:path_parser" ]
- }
}
}
@@ -4192,6 +4190,8 @@
"notifications/notification_test_util.h",
"notifications/stub_notification_platform_bridge.cc",
"notifications/stub_notification_platform_bridge.h",
+ "policy/test/local_policy_test_server.cc",
+ "policy/test/local_policy_test_server.h",
"search_engines/template_url_service_factory_test_util.cc",
"search_engines/template_url_service_factory_test_util.h",
"search_engines/template_url_service_test_util.cc",
@@ -4234,6 +4234,7 @@
"//components/invalidation/impl",
"//components/invalidation/impl:test_support",
"//components/password_manager/core/browser:test_support",
+ "//components/policy/core/browser:test_support",
"//components/prefs:test_support",
"//components/search_engines:test_support",
"//components/sessions:test_support",
@@ -4332,14 +4333,6 @@
deps += [ "//chromeos:test_support" ]
}
- if (enable_configuration_policy) {
- sources += [
- "policy/test/local_policy_test_server.cc",
- "policy/test/local_policy_test_server.h",
- ]
- public_deps += [ "//components/policy/core/browser:test_support" ]
- }
-
if (safe_browsing_mode == 1) {
sources += [
"extensions/fake_safe_browsing_database_manager.cc",
