Move PreferencesMac to components/policy/.

This is a re-land of https://codereview.chromium.org/78603003/

BUG=271392
R=joaodasilva,jochen

Review URL: https://codereview.chromium.org/104373002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@238960 0039d316-1c4b-4281-b951-d872f2087c98

13 files changed, 23 insertions, 21 deletions

diff --git a/chrome/browser/media_galleries/fileapi/iapps_finder_impl_mac.mm b/chrome/browser/media_galleries/fileapi/iapps_finder_impl_mac.mm
index 04abf15..d1d7572 100644
--- a/chrome/browser/media_galleries/fileapi/iapps_finder_impl_mac.mm
+++ b/chrome/browser/media_galleries/fileapi/iapps_finder_impl_mac.mm
@@ -10,8 +10,8 @@
 #import "base/mac/foundation_util.h"
 #import "base/mac/scoped_nsobject.h"
 #include "base/time/time.h"
-#include "chrome/browser/policy/preferences_mac.h"
 #include "chrome/browser/storage_monitor/storage_info.h"
+#include "components/policy/core/common/preferences_mac.h"
 #include "content/public/browser/browser_thread.h"
 
 using base::mac::CFCast;
diff --git a/chrome/browser/media_galleries/fileapi/picasa_finder_mac.mm b/chrome/browser/media_galleries/fileapi/picasa_finder_mac.mm
index 1a3dead..a01c350 100644
--- a/chrome/browser/media_galleries/fileapi/picasa_finder_mac.mm
+++ b/chrome/browser/media_galleries/fileapi/picasa_finder_mac.mm
@@ -7,7 +7,7 @@
 #include "base/files/file_path.h"
 #import "base/mac/foundation_util.h"
 #import "base/mac/scoped_nsobject.h"
-#include "chrome/browser/policy/preferences_mac.h"
+#include "components/policy/core/common/preferences_mac.h"
 #include "content/public/browser/browser_thread.h"
 
 using base::mac::CFCast;
diff --git a/chrome/browser/media_galleries/media_galleries_test_util.cc b/chrome/browser/media_galleries/media_galleries_test_util.cc
index 4696003..79ebcc6 100644
--- a/chrome/browser/media_galleries/media_galleries_test_util.cc
+++ b/chrome/browser/media_galleries/media_galleries_test_util.cc
@@ -27,7 +27,7 @@
 #include "base/mac/foundation_util.h"
 #include "base/strings/sys_string_conversions.h"
 #include "chrome/browser/media_galleries/fileapi/iapps_finder_impl.h"
-#include "chrome/browser/policy/preferences_mock_mac.h"
+#include "components/policy/core/common/preferences_mock_mac.h"
 #endif  // OS_MACOSX
 
 #if defined(OS_WIN)
diff --git a/chrome/browser/policy/browser_policy_connector.cc b/chrome/browser/policy/browser_policy_connector.cc
index 5c452ac..bccc637 100644
--- a/chrome/browser/policy/browser_policy_connector.cc
+++ b/chrome/browser/policy/browser_policy_connector.cc
@@ -56,7 +56,7 @@
 #elif defined(OS_MACOSX) && !defined(OS_IOS)
 #include <CoreFoundation/CoreFoundation.h>
 #include "chrome/browser/policy/policy_loader_mac.h"
-#include "chrome/browser/policy/preferences_mac.h"
+#include "components/policy/core/common/preferences_mac.h"
 #elif defined(OS_POSIX) && !defined(OS_ANDROID)
 #include "chrome/browser/policy/config_dir_policy_loader.h"
 #endif
diff --git a/chrome/browser/policy/policy_loader_mac.cc b/chrome/browser/policy/policy_loader_mac.cc
index 04a5e6f..1ee42ee 100644
--- a/chrome/browser/policy/policy_loader_mac.cc
+++ b/chrome/browser/policy/policy_loader_mac.cc
@@ -16,10 +16,10 @@
 #include "base/strings/sys_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/policy/policy_load_status.h"
-#include "chrome/browser/policy/preferences_mac.h"
 #include "components/policy/core/common/external_data_fetcher.h"
 #include "components/policy/core/common/policy_bundle.h"
 #include "components/policy/core/common/policy_map.h"
+#include "components/policy/core/common/preferences_mac.h"
 #include "components/policy/core/common/schema.h"
 #include "components/policy/core/common/schema_map.h"
 
diff --git a/chrome/browser/policy/policy_loader_mac_unittest.cc b/chrome/browser/policy/policy_loader_mac_unittest.cc
index 00a8cd5..5445447 100644
--- a/chrome/browser/policy/policy_loader_mac_unittest.cc
+++ b/chrome/browser/policy/policy_loader_mac_unittest.cc
@@ -11,12 +11,12 @@
 #include "base/strings/sys_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/policy/policy_loader_mac.h"
-#include "chrome/browser/policy/preferences_mock_mac.h"
 #include "components/policy/core/common/async_policy_provider.h"
 #include "components/policy/core/common/configuration_policy_provider_test.h"
 #include "components/policy/core/common/external_data_fetcher.h"
 #include "components/policy/core/common/policy_bundle.h"
 #include "components/policy/core/common/policy_map.h"
+#include "components/policy/core/common/preferences_mock_mac.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::ScopedCFTypeRef;
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 48cac58..9e843a7 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1552,8 +1552,6 @@
         'browser/policy/policy_statistics_collector.h',
         'browser/policy/policy_transformations.cc',
         'browser/policy/policy_transformations.h',
-        'browser/policy/preferences_mac.cc',
-        'browser/policy/preferences_mac.h',
         'browser/policy/preg_parser_win.cc',
         'browser/policy/preg_parser_win.h',
         'browser/policy/profile_policy_connector.cc',
diff --git a/chrome/chrome_tests_unit.gypi b/chrome/chrome_tests_unit.gypi
index 5b4104d..58dd1ee 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -164,8 +164,6 @@
         'browser/policy/cloud/mock_device_management_service.h',
         'browser/policy/cloud/policy_builder.cc',
         'browser/policy/cloud/policy_builder.h',
-        'browser/policy/preferences_mock_mac.cc',
-        'browser/policy/preferences_mock_mac.h',
         'browser/policy/test/local_policy_test_server.cc',
         'browser/policy/test/local_policy_test_server.h',
         'browser/policy/test/policy_test_utils.cc',
diff --git a/components/policy.gypi b/components/policy.gypi
index 35e3bc3d..9bef4f0 100644
--- a/components/policy.gypi
+++ b/components/policy.gypi
@@ -44,6 +44,8 @@
             'policy/core/common/policy_switches.cc',
             'policy/core/common/policy_switches.h',
             'policy/core/common/policy_types.h',
+            'policy/core/common/preferences_mac.cc',
+            'policy/core/common/preferences_mac.h',
             'policy/core/common/registry_dict_win.cc',
             'policy/core/common/registry_dict_win.h',
             'policy/core/common/schema.cc',
@@ -106,6 +108,8 @@
             'policy/core/common/configuration_policy_provider_test.h',
             'policy/core/common/mock_configuration_policy_provider.cc',
             'policy/core/common/mock_configuration_policy_provider.h',
+            'policy/core/common/preferences_mock_mac.cc',
+            'policy/core/common/preferences_mock_mac.h',
           ],
         },
       ],
diff --git a/chrome/browser/policy/preferences_mac.cc b/components/policy/core/common/preferences_mac.cc
index cfc041f..e65b162 100644
--- a/chrome/browser/policy/preferences_mac.cc
+++ b/components/policy/core/common/preferences_mac.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/policy/preferences_mac.h"
+#include "components/policy/core/common/preferences_mac.h"
 
 Boolean MacPreferences::AppSynchronize(CFStringRef applicationID) {
   return CFPreferencesAppSynchronize(applicationID);
diff --git a/chrome/browser/policy/preferences_mac.h b/components/policy/core/common/preferences_mac.h
index 31a46d8..5bb14c0 100644
--- a/chrome/browser/policy/preferences_mac.h
+++ b/components/policy/core/common/preferences_mac.h
@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_POLICY_PREFERENCES_MAC_H_
-#define CHROME_BROWSER_POLICY_PREFERENCES_MAC_H_
+#ifndef COMPONENTS_POLICY_CORE_COMMON_PREFERENCES_MAC_H_
+#define COMPONENTS_POLICY_CORE_COMMON_PREFERENCES_MAC_H_
 
 #include <CoreFoundation/CoreFoundation.h>
 
 #include "base/basictypes.h"
+#include "components/policy/policy_export.h"
 
 // Wraps a small part of the CFPreferences API surface in a very thin layer, to
 // allow it to be mocked out for testing.
@@ -15,7 +16,7 @@
 // See CFPreferences documentation for function documentation, as these call
 // through directly to their CFPreferences equivalents (Foo ->
 // CFPreferencesFoo).
-class MacPreferences {
+class POLICY_EXPORT MacPreferences {
  public:
   MacPreferences() {}
   virtual ~MacPreferences() {}
@@ -31,4 +32,4 @@ class MacPreferences {
   DISALLOW_COPY_AND_ASSIGN(MacPreferences);
 };
 
-#endif  // CHROME_BROWSER_POLICY_PREFERENCES_MAC_H_
+#endif  // COMPONENTS_POLICY_CORE_COMMON_PREFERENCES_MAC_H_
diff --git a/chrome/browser/policy/preferences_mock_mac.cc b/components/policy/core/common/preferences_mock_mac.cc
index 9d11df6..bc51c9a 100644
--- a/chrome/browser/policy/preferences_mock_mac.cc
+++ b/components/policy/core/common/preferences_mock_mac.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "chrome/browser/policy/preferences_mock_mac.h"
+#include "components/policy/core/common/preferences_mock_mac.h"
 
 MockPreferences::MockPreferences() {
   values_.reset(CFDictionaryCreateMutable(kCFAllocatorDefault,
diff --git a/chrome/browser/policy/preferences_mock_mac.h b/components/policy/core/common/preferences_mock_mac.h
index 3a28816..f28f8fe 100644
--- a/chrome/browser/policy/preferences_mock_mac.h
+++ b/components/policy/core/common/preferences_mock_mac.h
@@ -2,14 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef CHROME_BROWSER_POLICY_PREFERENCES_MOCK_MAC_H_
-#define CHROME_BROWSER_POLICY_PREFERENCES_MOCK_MAC_H_
+#ifndef COMPONENTS_POLICY_CORE_COMMON_PREFERENCES_MOCK_MAC_H_
+#define COMPONENTS_POLICY_CORE_COMMON_PREFERENCES_MOCK_MAC_H_
 
 #include "base/mac/scoped_cftyperef.h"
-#include "chrome/browser/policy/preferences_mac.h"
+#include "components/policy/core/common/preferences_mac.h"
+#include "components/policy/policy_export.h"
 
 // Mock preferences wrapper for testing code that interacts with CFPreferences.
-class MockPreferences : public MacPreferences {
+class POLICY_EXPORT MockPreferences : public MacPreferences {
  public:
   MockPreferences();
   virtual ~MockPreferences();
@@ -30,4 +31,4 @@ class MockPreferences : public MacPreferences {
   base::ScopedCFTypeRef<CFMutableSetRef> forced_;
 };
 
-#endif  // CHROME_BROWSER_POLICY_PREFERENCES_MOCK_MAC_H_
+#endif  // COMPONENTS_POLICY_CORE_COMMON_PREFERENCES_MOCK_MAC_H_