Using PolicyServiceWatcher instead of PolicyWatcherLinux/Win/Mac.

components/policy/policy_common.gypi

 # 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.
 
 {
   # GN version: //components/policy/core/common
   'dependencies': [
     '../base/base.gyp:base',
   ],
   'defines': [
@@ skipping 81 matching lines @@
         'core/common/external_data_manager.h',
         'core/common/mac_util.cc',
         'core/common/mac_util.h',
         'core/common/policy_bundle.cc',
         'core/common/policy_bundle.h',
         'core/common/policy_details.h',
         'core/common/policy_load_status.cc',
         'core/common/policy_load_status.h',
         'core/common/policy_loader_ios.h',
         'core/common/policy_loader_ios.mm',
-        'core/common/policy_loader_mac.cc',
         'core/common/policy_loader_mac.h',
+        'core/common/policy_loader_mac.mm',
         'core/common/policy_loader_win.cc',
         'core/common/policy_loader_win.h',
         'core/common/policy_map.cc',
         'core/common/policy_map.h',
         'core/common/policy_namespace.cc',
         'core/common/policy_namespace.h',
         'core/common/policy_pref_names.cc',
         'core/common/policy_pref_names.h',
         'core/common/policy_provider_android.cc',
         'core/common/policy_provider_android.h',
@@ skipping 91 matching lines @@
         'core/common/policy_pref_names.cc',
         'core/common/policy_pref_names.h',
         'core/common/policy_service.cc',
         'core/common/policy_service.h',
         'core/common/policy_service_stub.cc',
         'core/common/policy_service_stub.h',
       ],
     }],
   ],
 }