mac/gn: Make sure components_unittests contain the same tests in gyp and gn builds.

components/policy/core/common/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/features.gni")
 
 source_set("common") {
   visibility = [
     "//components/policy/*",
     "//components/syncable_prefs/*",
@@ skipping 58 matching lines @@
       "cloud/user_cloud_policy_store_base.h",
       "cloud/user_info_fetcher.cc",
       "cloud/user_info_fetcher.h",
       "config_dir_policy_loader.cc",
       "config_dir_policy_loader.h",
       "configuration_policy_provider.cc",
       "configuration_policy_provider.h",
       "external_data_fetcher.cc",
       "external_data_fetcher.h",
       "external_data_manager.h",
-      "mac_util.cc",
-      "mac_util.h",
       "policy_bundle.cc",
       "policy_bundle.h",
       "policy_details.h",
       "policy_load_status.cc",
       "policy_load_status.h",
       "policy_loader_ios.h",
       "policy_loader_ios.mm",
       "policy_loader_mac.h",
       "policy_loader_mac.mm",
       "policy_loader_win.cc",
@@ skipping 94 matching lines @@
         "cloud/cloud_policy_client_registration_helper.h",
         "cloud/user_cloud_policy_manager.cc",
         "cloud/user_cloud_policy_manager.h",
         "cloud/user_cloud_policy_store.cc",
         "cloud/user_cloud_policy_store.h",
       ]
     }
     if (is_mac) {
       libs = [ "CoreFoundation.framework" ]
     }
-    if (!is_ios && !is_mac) {
-      sources -= [
+    if (is_ios || is_mac) {
+      sources += [
         "mac_util.cc",
         "mac_util.h",
       ]
     }
   } else {
     # Some of the policy code is always enabled, so that other parts of Chrome
     # can always interface with the PolicyService without having to #ifdef on
     # ENABLE_CONFIGURATION_POLICY.
     sources = [
       "external_data_fetcher.cc",
@@ skipping 13 matching lines @@
     deps = [
       "//base",
     ]
   }
 }
 
 if (enable_configuration_policy) {
   source_set("unit_tests") {
     testonly = true
     sources = [
-      "async_policy_provider_unittest.cc",
       "cloud/cloud_policy_client_unittest.cc",
       "cloud/cloud_policy_constants_unittest.cc",
       "cloud/cloud_policy_core_unittest.cc",
       "cloud/cloud_policy_manager_unittest.cc",
       "cloud/cloud_policy_refresh_scheduler_unittest.cc",
       "cloud/cloud_policy_service_unittest.cc",
       "cloud/cloud_policy_validator_unittest.cc",
-      "cloud/component_cloud_policy_service_unittest.cc",
-      "cloud/component_cloud_policy_store_unittest.cc",
-      "cloud/component_cloud_policy_updater_unittest.cc",
       "cloud/device_management_service_unittest.cc",
-      "cloud/external_policy_data_fetcher_unittest.cc",
-      "cloud/external_policy_data_updater_unittest.cc",
       "cloud/policy_header_io_helper_unittest.cc",
       "cloud/policy_header_service_unittest.cc",
-      "cloud/resource_cache_unittest.cc",
-      "cloud/user_cloud_policy_manager_unittest.cc",
-      "cloud/user_cloud_policy_store_unittest.cc",
       "cloud/user_info_fetcher_unittest.cc",
-      "config_dir_policy_loader_unittest.cc",
       "generate_policy_source_unittest.cc",
       "policy_bundle_unittest.cc",
       "policy_loader_ios_unittest.mm",
       "policy_loader_mac_unittest.cc",
       "policy_loader_win_unittest.cc",
       "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",
       "schema_registry_tracking_policy_provider_unittest.cc",
       "schema_registry_unittest.cc",
       "schema_unittest.cc",
     ]
-
-    if (is_chromeos) {
-      sources -= [
+    if (!is_chromeos) {
+      sources += [
         "cloud/user_cloud_policy_manager_unittest.cc",
         "cloud/user_cloud_policy_store_unittest.cc",
       ]
     }
-
-    if (is_android) {
-      sources -= [ "async_policy_provider_unittest.cc" ]
+    if (!is_android) {
+      sources += [ "async_policy_provider_unittest.cc" ]
     }
-
-    if (is_android || is_ios) {
-      sources -= [
+    if (!is_android && !is_ios) {
+      sources += [
         "cloud/component_cloud_policy_service_unittest.cc",
         "cloud/component_cloud_policy_store_unittest.cc",
         "cloud/component_cloud_policy_updater_unittest.cc",
         "cloud/external_policy_data_fetcher_unittest.cc",
         "cloud/external_policy_data_updater_unittest.cc",
         "cloud/resource_cache_unittest.cc",
         "config_dir_policy_loader_unittest.cc",
       ]
     }
+    if (is_mac || is_ios) {
+      sources += [ "mac_util_unittest.cc" ]

[Nico, 2016/06/03 19:19:49]

(that's the new file here; the other changes to this file are no-ops)

+    }
+
     if (is_win) {
       # Needed by policy_loader_win_unittest.cc and preg_parser_win_unittest.cc
       data = [
         "//chrome/test/data/policy/",
       ]
     }
 
     deps = [
       "//base",
       "//base/test:test_support",
       "//components/policy",
       "//components/policy:policy_component_test_support",
       "//components/prefs:test_support",
       "//components/prefs:test_support",
       "//google_apis",
       "//net:test_support",
       "//testing/gmock",
       "//testing/gtest",
     ]
   }
 }