Revert 237409 "Move PreferencesMac to components/policy/."

> Move PreferencesMac to components/policy/.
> 
> This facilitates the refactoring of chrome/browser/policy into a layered
> component.
> 
> BUG=271392
> 
> Review URL: https://codereview.chromium.org/78603003

TBR=dconnelly@chromium.org

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

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

14 files changed, 25 insertions, 41 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 c877c0c..bf0e5af 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 a01c350..1a3dead 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 "components/policy/core/common/preferences_mac.h"
+#include "chrome/browser/policy/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 79ebcc6..4696003 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 "components/policy/core/common/preferences_mock_mac.h"
+#include "chrome/browser/policy/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 2a3c802..1f0fb1e 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 "components/policy/core/common/preferences_mac.h"
+#include "chrome/browser/policy/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 146bbdf..3355c83 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 3e3abb8..71685e1 100644
--- a/chrome/browser/policy/policy_loader_mac_unittest.cc
+++ b/chrome/browser/policy/policy_loader_mac_unittest.cc
@@ -13,10 +13,10 @@
 #include "chrome/browser/policy/async_policy_provider.h"
 #include "chrome/browser/policy/configuration_policy_provider_test.h"
 #include "chrome/browser/policy/policy_loader_mac.h"
+#include "chrome/browser/policy/preferences_mock_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_mock_mac.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 using base::ScopedCFTypeRef;
diff --git a/components/policy/core/common/preferences_mac.cc b/chrome/browser/policy/preferences_mac.cc
index e65b162..cb14868 100644
--- a/components/policy/core/common/preferences_mac.cc
+++ b/chrome/browser/policy/preferences_mac.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
-#include "components/policy/core/common/preferences_mac.h"
+#include "chrome/browser/policy/preferences_mac.h"
 
 Boolean MacPreferences::AppSynchronize(CFStringRef applicationID) {
   return CFPreferencesAppSynchronize(applicationID);
diff --git a/components/policy/core/common/preferences_mac.h b/chrome/browser/policy/preferences_mac.h
index 5bb14c0..bbe72a6 100644
--- a/components/policy/core/common/preferences_mac.h
+++ b/chrome/browser/policy/preferences_mac.h
@@ -1,14 +1,13 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
-#ifndef COMPONENTS_POLICY_CORE_COMMON_PREFERENCES_MAC_H_
-#define COMPONENTS_POLICY_CORE_COMMON_PREFERENCES_MAC_H_
+#ifndef CHROME_BROWSER_POLICY_PREFERENCES_MAC_H_
+#define CHROME_BROWSER_POLICY_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.
@@ -16,7 +15,7 @@
 // See CFPreferences documentation for function documentation, as these call
 // through directly to their CFPreferences equivalents (Foo ->
 // CFPreferencesFoo).
-class POLICY_EXPORT MacPreferences {
+class MacPreferences {
  public:
   MacPreferences() {}
   virtual ~MacPreferences() {}
@@ -32,4 +31,4 @@ class POLICY_EXPORT MacPreferences {
   DISALLOW_COPY_AND_ASSIGN(MacPreferences);
 };
 
-#endif  // COMPONENTS_POLICY_CORE_COMMON_PREFERENCES_MAC_H_
+#endif  // CHROME_BROWSER_POLICY_PREFERENCES_MAC_H_
diff --git a/components/policy/core/common/preferences_mock_mac.cc b/chrome/browser/policy/preferences_mock_mac.cc
index bc51c9a..ba5e911 100644
--- a/components/policy/core/common/preferences_mock_mac.cc
+++ b/chrome/browser/policy/preferences_mock_mac.cc
@@ -1,8 +1,8 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
-#include "components/policy/core/common/preferences_mock_mac.h"
+#include "chrome/browser/policy/preferences_mock_mac.h"
 
 MockPreferences::MockPreferences() {
   values_.reset(CFDictionaryCreateMutable(kCFAllocatorDefault,
diff --git a/components/policy/core/common/preferences_mock_mac.h b/chrome/browser/policy/preferences_mock_mac.h
index f28f8fe..0f6fef1 100644
--- a/components/policy/core/common/preferences_mock_mac.h
+++ b/chrome/browser/policy/preferences_mock_mac.h
@@ -1,16 +1,15 @@
-// Copyright 2013 The Chromium Authors. All rights reserved.
+// Copyright (c) 2011 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.
 
-#ifndef COMPONENTS_POLICY_CORE_COMMON_PREFERENCES_MOCK_MAC_H_
-#define COMPONENTS_POLICY_CORE_COMMON_PREFERENCES_MOCK_MAC_H_
+#ifndef CHROME_BROWSER_POLICY_PREFERENCES_MOCK_MAC_H_
+#define CHROME_BROWSER_POLICY_PREFERENCES_MOCK_MAC_H_
 
 #include "base/mac/scoped_cftyperef.h"
-#include "components/policy/core/common/preferences_mac.h"
-#include "components/policy/policy_export.h"
+#include "chrome/browser/policy/preferences_mac.h"
 
 // Mock preferences wrapper for testing code that interacts with CFPreferences.
-class POLICY_EXPORT MockPreferences : public MacPreferences {
+class MockPreferences : public MacPreferences {
  public:
   MockPreferences();
   virtual ~MockPreferences();
@@ -31,4 +30,4 @@ class POLICY_EXPORT MockPreferences : public MacPreferences {
   base::ScopedCFTypeRef<CFMutableSetRef> forced_;
 };
 
-#endif  // COMPONENTS_POLICY_CORE_COMMON_PREFERENCES_MOCK_MAC_H_
+#endif  // CHROME_BROWSER_POLICY_PREFERENCES_MOCK_MAC_H_
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 6e24e65..a6aa493 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -1579,6 +1579,8 @@
         '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 99e329d1..eb7e9c5 100644
--- a/chrome/chrome_tests_unit.gypi
+++ b/chrome/chrome_tests_unit.gypi
@@ -18,7 +18,6 @@
         'common',
         '../base/base.gyp:base_prefs_test_support',
         '../base/base.gyp:test_support_base',
-        '../components/components.gyp:policy_test_support',
         '../components/components.gyp:sessions_test_support',
         '../content/content.gyp:content_app_both',
         '../content/content_shell_and_tests.gyp:test_support_content',
@@ -166,6 +165,8 @@
         'browser/policy/cloud/policy_builder.h',
         'browser/policy/mock_configuration_policy_provider.cc',
         'browser/policy/mock_configuration_policy_provider.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/components_tests.gyp b/components/components_tests.gyp
index b70f043..e21d2af 100644
--- a/components/components_tests.gyp
+++ b/components/components_tests.gyp
@@ -90,7 +90,6 @@
 
             # Dependencies of policy
             'components.gyp:policy_component',
-            'components.gyp:policy_test_support',
 
             # Dependencies of precache
             'components.gyp:precache_core',
diff --git a/components/policy.gypi b/components/policy.gypi
index ca168d7..4580dea 100644
--- a/components/policy.gypi
+++ b/components/policy.gypi
@@ -36,8 +36,6 @@
             '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',
@@ -65,19 +63,5 @@
         }],
       ],
     },
-    {
-      'target_name': 'policy_test_support',
-      'type': 'static_library',
-      'defines!': ['POLICY_COMPONENT_IMPLEMENTATION'],
-      'dependencies': [],
-      'include_dirs': [
-        '..',
-      ],
-      'sources': [
-        'policy/core/common/preferences_mock_mac.cc',
-        'policy/core/common/preferences_mock_mac.h',
-      ],
-      'conditions': [],
-    },
   ],
 }