4 files changed, 37 insertions, 5 deletions

diff --git a/chromium/components/policy/android/BUILD.gn b/chromium/components/policy/android/BUILD.gn
index 9a6045e255a..eb0bd6488c5 100644
--- a/chromium/components/policy/android/BUILD.gn
+++ b/chromium/components/policy/android/BUILD.gn
@@ -57,7 +57,11 @@ java_library("components_policy_junit_tests") {
     ":policy_java",
     ":policy_java_test_support",
     "//base:base_java",
+    "//base:base_java_test_support",
     "//base:base_junit_test_support",
+    "//third_party/android_deps:robolectric_all_java",
     "//third_party/hamcrest:hamcrest_java",
+    "//third_party/junit",
+    "//third_party/mockito:mockito_java",
   ]
 }
diff --git a/chromium/components/policy/core/browser/BUILD.gn b/chromium/components/policy/core/browser/BUILD.gn
index cc42d278268..f2da5a30443 100644
--- a/chromium/components/policy/core/browser/BUILD.gn
+++ b/chromium/components/policy/core/browser/BUILD.gn
@@ -122,6 +122,7 @@ source_set("unit_tests") {
     "android/android_combined_policy_provider_unittest.cc",
     "android/policy_converter_unittest.cc",
     "browser_policy_connector_unittest.cc",
+    "configuration_policy_handler_list_unittest.cc",
     "configuration_policy_handler_unittest.cc",
     "configuration_policy_pref_store_unittest.cc",
     "proxy_policy_handler_unittest.cc",
diff --git a/chromium/components/policy/core/common/BUILD.gn b/chromium/components/policy/core/common/BUILD.gn
index da28cea16ae..458ce081e73 100644
--- a/chromium/components/policy/core/common/BUILD.gn
+++ b/chromium/components/policy/core/common/BUILD.gn
@@ -106,6 +106,10 @@ jumbo_source_set("internal") {
     "features.h",
     "json_schema_constants.cc",
     "json_schema_constants.h",
+    "management/management_service.cc",
+    "management/management_service.h",
+    "management/platform_management_service.cc",
+    "management/platform_management_service.h",
     "plist_writer.cc",
     "plist_writer.h",
     "policy_bundle.cc",
@@ -113,6 +117,8 @@ jumbo_source_set("internal") {
     "policy_details.h",
     "policy_load_status.cc",
     "policy_load_status.h",
+    "policy_loader_common.cc",
+    "policy_loader_common.h",
     "policy_map.cc",
     "policy_map.h",
     "policy_merger.cc",
@@ -144,6 +150,8 @@ jumbo_source_set("internal") {
     "schema_registry.h",
     "schema_registry_tracking_policy_provider.cc",
     "schema_registry_tracking_policy_provider.h",
+    "values_util.cc",
+    "values_util.h",
   ]
 
   configs += [ "//build/config:precompiled_headers" ]
@@ -158,6 +166,7 @@ jumbo_source_set("internal") {
     "//base:i18n",
     "//base/third_party/dynamic_annotations",
     "//components/account_id",
+    "//components/enterprise/common:strings",
     "//components/prefs",
     "//components/signin/public/identity_manager",
     "//components/strings",
@@ -180,6 +189,8 @@ jumbo_source_set("internal") {
 
   if (is_win) {
     sources += [
+      "management/platform_management_status_provider_win.cc",
+      "management/platform_management_status_provider_win.h",
       "policy_loader_win.cc",
       "policy_loader_win.h",
     ]
@@ -222,6 +233,7 @@ jumbo_source_set("internal") {
     ]
   }
   if (is_chromeos) {
+    deps += [ "//chromeos/system" ]
     sources += [
       "policy_scheduler.cc",
       "policy_scheduler.h",
@@ -293,6 +305,8 @@ jumbo_static_library("test_support") {
     "configuration_policy_provider_test.h",
     "fake_async_policy_loader.cc",
     "fake_async_policy_loader.h",
+    "management/scoped_management_service_override_for_testing.cc",
+    "management/scoped_management_service_override_for_testing.h",
     "mock_configuration_policy_provider.cc",
     "mock_configuration_policy_provider.h",
     "mock_policy_service.cc",
@@ -375,6 +389,7 @@ source_set("unit_tests") {
     "cloud/device_management_service_unittest.cc",
     "cloud/user_info_fetcher_unittest.cc",
     "generate_policy_source_unittest.cc",
+    "management/management_service_unittest.cc",
     "plist_writer_unittest.cc",
     "policy_bundle_unittest.cc",
     "policy_map_unittest.cc",
@@ -386,6 +401,7 @@ source_set("unit_tests") {
     "schema_registry_tracking_policy_provider_unittest.cc",
     "schema_registry_unittest.cc",
     "schema_unittest.cc",
+    "values_util_unittest.cc",
   ]
   if (is_win || is_linux) {
     sources += [
@@ -403,10 +419,8 @@ source_set("unit_tests") {
       "cloud/machine_level_user_cloud_policy_manager_unittest.cc",
       "cloud/machine_level_user_cloud_policy_store_unittest.cc",
       "cloud/user_cloud_policy_manager_unittest.cc",
+      "cloud/user_cloud_policy_store_unittest.cc",
     ]
-    if (!is_ios) {
-      sources += [ "cloud/user_cloud_policy_store_unittest.cc" ]
-    }
   }
 
   if (is_fuchsia) {
@@ -470,6 +484,9 @@ source_set("unit_tests") {
     "//testing/gtest",
     "//third_party/libxml:xml_reader",
   ]
+  if (is_chromeos) {
+    deps += [ "//chromeos/system" ]
+  }
 }
 
 if (is_win || is_linux) {
diff --git a/chromium/components/policy/proto/BUILD.gn b/chromium/components/policy/proto/BUILD.gn
index 07056950460..ea16d7f65ac 100644
--- a/chromium/components/policy/proto/BUILD.gn
+++ b/chromium/components/policy/proto/BUILD.gn
@@ -17,14 +17,24 @@ component("proto") {
 proto_library("policy_record_constants") {
   visibility = [
     "//chrome/browser:browser",
-    "//chrome/browser:reporting_record_proto",
-    "//chrome/browser:reporting_record_proto_gen",
+    ":reporting_record_proto",
+    ":reporting_record_proto_gen",
   ]
   sources = [ "record_constants.proto" ]
 
   proto_out_dir = "components/policy/proto"
 }
 
+# Record definitions for reporting.
+proto_library("reporting_record_proto") {
+  visibility = [ "//chrome/browser:browser" ]
+  sources = [ "record.proto" ]
+
+  deps = [ ":policy_record_constants" ]
+
+  proto_out_dir = "components/policy/proto"
+}
+
 proto_library("policy_common_definitions_compile_proto") {
   visibility = [
     "//components/policy:cloud_policy_proto_generated_compile_proto",