Push preg_parser and registry_dict changes upstream

components/policy/core/common/BUILD.gn

Index: components/policy/core/common/BUILD.gn
diff --git a/components/policy/core/common/BUILD.gn b/components/policy/core/common/BUILD.gn
index ced5303216ed061227738fad95854cc34592518d..b857e26ce9d0ba424f6080441eeb410ed0ecb64b 100644
--- a/components/policy/core/common/BUILD.gn
+++ b/components/policy/core/common/BUILD.gn
@@ -112,10 +112,6 @@ source_set("internal") {
       "policy_types.h",
       "preferences_mac.cc",
       "preferences_mac.h",
-      "preg_parser_win.cc",
-      "preg_parser_win.h",
-      "registry_dict_win.cc",
-      "registry_dict_win.h",
       "remote_commands/remote_command_job.cc",
       "remote_commands/remote_command_job.h",
       "remote_commands/remote_commands_factory.cc",
@@ -160,6 +156,14 @@ source_set("internal") {
         "ntdsapi.lib",
       ]
     }
+    if (is_win || is_chromeos) {
+      sources += [
+        "preg_parser.cc",
+        "preg_parser.h",
+        "registry_dict.cc",
+        "registry_dict.h",
+      ]
+    }
     if (is_android) {
       sources += [ "cloud/component_cloud_policy_service_stub.cc" ]
       sources -= [
@@ -308,8 +312,6 @@ if (enable_configuration_policy) {
       "policy_map_unittest.cc",
       "policy_service_impl_unittest.cc",
       "policy_statistics_collector_unittest.cc",
-      "preg_parser_win_unittest.cc",
-      "registry_dict_win_unittest.cc",
       "remote_commands/remote_commands_queue_unittest.cc",
       "remote_commands/remote_commands_service_unittest.cc",
       "schema_map_unittest.cc",
@@ -317,6 +319,12 @@ if (enable_configuration_policy) {
       "schema_registry_unittest.cc",
       "schema_unittest.cc",
     ]
+    if (is_win || is_chromeos) {
+      sources += [
+        "preg_parser_unittest.cc",
+        "registry_dict_unittest.cc",
+      ]
+    }
     if (is_chromeos) {
       sources += [ "proxy_policy_provider_unittest.cc" ]
     } else {
@@ -342,9 +350,8 @@ if (enable_configuration_policy) {
     if (is_mac || is_ios) {
       sources += [ "mac_util_unittest.cc" ]
     }
-
-    if (is_win) {
-      # Needed by policy_loader_win_unittest.cc and preg_parser_win_unittest.cc
+    if (is_win || is_chromeos) {
+      # Needed by policy_loader_win_unittest.cc and preg_parser_unittest.cc
       data = [
         "//chrome/test/data/policy/",
       ]