components: Extract pref_registry component out of user_prefs.

The reason for doing this is that user_prefs depends on content_browser,
which brings a lot of extra dependencies that takes a lot of time to build
(yeah, I'm looking at you Blink and V8) and bookmarks is one of the targets
that should not depend on content.

BUG=359565
TEST=green trybots
R=blundell@chromium.org, sky@chromium.org, yoz@chromium.org

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

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

35 files changed, 108 insertions, 41 deletions

diff --git a/components/autofill.gypi b/components/autofill.gypi
index ca0d7a3..9b78b76 100644
--- a/components/autofill.gypi
+++ b/components/autofill.gypi
@@ -107,7 +107,7 @@
         'components_resources.gyp:components_resources',
         'components_strings.gyp:components_strings',
         'os_crypt',
-        'user_prefs',
+        'pref_registry',
         'webdata_common',
       ],
       'sources': [
diff --git a/components/autofill/core/DEPS b/components/autofill/core/DEPS
index fe503bd..fb45023 100644
--- a/components/autofill/core/DEPS
+++ b/components/autofill/core/DEPS
@@ -1,7 +1,4 @@
 include_rules = [
   "+components/os_crypt",
-  # TODO(joi): Perhaps PrefRegistrySyncable should be a separate
-  # component since it is currently in the same component as
-  # UserPrefs, which uses content::BrowserContext.
-  "+components/user_prefs/pref_registry_syncable.h",
+  "+components/pref_registry",
 ]
diff --git a/components/autofill/core/browser/autofill_manager.cc b/components/autofill/core/browser/autofill_manager.cc
index 4c42479..bfb8d49 100644
--- a/components/autofill/core/browser/autofill_manager.cc
+++ b/components/autofill/core/browser/autofill_manager.cc
@@ -42,7 +42,7 @@
 #include "components/autofill/core/common/form_data_predictions.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/autofill/core/common/password_form_fill_data.h"
-#include "components/user_prefs/pref_registry_syncable.h"
+#include "components/pref_registry/pref_registry_syncable.h"
 #include "grit/component_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/gfx/rect.h"
diff --git a/components/autofill/core/browser/autofill_test_utils.cc b/components/autofill/core/browser/autofill_test_utils.cc
index 2133388..081defa 100644
--- a/components/autofill/core/browser/autofill_test_utils.cc
+++ b/components/autofill/core/browser/autofill_test_utils.cc
@@ -17,7 +17,7 @@
 #include "components/autofill/core/common/form_data.h"
 #include "components/autofill/core/common/form_field_data.h"
 #include "components/os_crypt/os_crypt.h"
-#include "components/user_prefs/pref_registry_syncable.h"
+#include "components/pref_registry/pref_registry_syncable.h"
 
 using base::ASCIIToUTF16;
 
diff --git a/components/bookmarks.gypi b/components/bookmarks.gypi
index f056d62..1c46f14 100644
--- a/components/bookmarks.gypi
+++ b/components/bookmarks.gypi
@@ -22,7 +22,7 @@
         'favicon_base',
         'query_parser',
         'startup_metric_utils',
-        'user_prefs',
+        'pref_registry',
       ],
       'sources': [
         'bookmarks/core/browser/base_bookmark_model_observer.cc',
diff --git a/components/bookmarks/DEPS b/components/bookmarks/DEPS
index 3dcea05..b067410 100644
--- a/components/bookmarks/DEPS
+++ b/components/bookmarks/DEPS
@@ -1,8 +1,8 @@
 include_rules = [
   "+components/favicon_base",
+  "+components/pref_registry",
   "+components/query_parser",
   "+components/startup_metric_utils",
-  "+components/user_prefs",
   "+grit/component_strings.h",
   "+net/base",
   "+ui",
diff --git a/components/bookmarks/core/browser/bookmark_expanded_state_tracker_unittest.cc b/components/bookmarks/core/browser/bookmark_expanded_state_tracker_unittest.cc
index 5404964..b45d954 100644
--- a/components/bookmarks/core/browser/bookmark_expanded_state_tracker_unittest.cc
+++ b/components/bookmarks/core/browser/bookmark_expanded_state_tracker_unittest.cc
@@ -15,7 +15,7 @@
 #include "components/bookmarks/core/common/bookmark_pref_names.h"
 #include "components/bookmarks/core/test/bookmark_test_helpers.h"
 #include "components/bookmarks/core/test/test_bookmark_client.h"
-#include "components/user_prefs/pref_registry_syncable.h"
+#include "components/pref_registry/pref_registry_syncable.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 scoped_ptr<PrefService> PrefServiceForTesting() {
diff --git a/components/bookmarks/core/browser/bookmark_utils.cc b/components/bookmarks/core/browser/bookmark_utils.cc
index b7e9a17..8baec23 100644
--- a/components/bookmarks/core/browser/bookmark_utils.cc
+++ b/components/bookmarks/core/browser/bookmark_utils.cc
@@ -17,8 +17,8 @@
 #include "components/bookmarks/core/browser/bookmark_model.h"
 #include "components/bookmarks/core/browser/scoped_group_bookmark_actions.h"
 #include "components/bookmarks/core/common/bookmark_pref_names.h"
+#include "components/pref_registry/pref_registry_syncable.h"
 #include "components/query_parser/query_parser.h"
-#include "components/user_prefs/pref_registry_syncable.h"
 #include "net/base/net_util.h"
 #include "ui/base/models/tree_node_iterator.h"
 #include "url/gurl.h"
diff --git a/components/components.gyp b/components/components.gyp
index 7d57704..ef080c0 100644
--- a/components/components.gyp
+++ b/components/components.gyp
@@ -36,6 +36,7 @@
     'password_manager.gypi',
     'policy.gypi',
     'precache.gypi',
+    'pref_registry.gypi',
     'query_parser.gypi',
     'rappor.gypi',
     'search_provider_logos.gypi',
diff --git a/components/data_reduction_proxy.gypi b/components/data_reduction_proxy.gypi
index 869ef06..31aa0bd 100644
--- a/components/data_reduction_proxy.gypi
+++ b/components/data_reduction_proxy.gypi
@@ -9,10 +9,11 @@
       'target_name': 'data_reduction_proxy_browser',
       'type': 'static_library',
       'dependencies': [
-        'data_reduction_proxy_common',
         '../base/base.gyp:base',
         '../crypto/crypto.gyp:crypto',
         '../net/net.gyp:net',
+        'data_reduction_proxy_common',
+        'pref_registry',
       ],
       'include_dirs': [
         '..',
@@ -38,7 +39,6 @@
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
-        '../components/components.gyp:user_prefs',
       ],
       'include_dirs': [
         '..',
@@ -54,12 +54,12 @@
       'target_name': 'data_reduction_proxy_test_support',
       'type': 'static_library',
       'dependencies' : [
-        'data_reduction_proxy_browser',
-        'data_reduction_proxy_common',
         '../base/base.gyp:base',
         '../net/net.gyp:net',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
+        'data_reduction_proxy_browser',
+        'data_reduction_proxy_common',
       ],
       'include_dirs': [
         '..',
diff --git a/components/data_reduction_proxy/DEPS b/components/data_reduction_proxy/DEPS
index bfc9d61..a1c481f 100644
--- a/components/data_reduction_proxy/DEPS
+++ b/components/data_reduction_proxy/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
-  "+components/user_prefs",
+  "+components/pref_registry",
   "+crypto",
   "+net",
 ]
diff --git a/components/data_reduction_proxy/browser/data_reduction_proxy_prefs.cc b/components/data_reduction_proxy/browser/data_reduction_proxy_prefs.cc
index ee90c2e..8e59a3f 100644
--- a/components/data_reduction_proxy/browser/data_reduction_proxy_prefs.cc
+++ b/components/data_reduction_proxy/browser/data_reduction_proxy_prefs.cc
@@ -6,7 +6,7 @@
 
 #include "base/prefs/pref_registry_simple.h"
 #include "components/data_reduction_proxy/common/data_reduction_proxy_pref_names.h"
-#include "components/user_prefs/pref_registry_syncable.h"
+#include "components/pref_registry/pref_registry_syncable.h"
 
 namespace data_reduction_proxy {
 
diff --git a/components/keyed_service/content/DEPS b/components/keyed_service/content/DEPS
index 0c342f6..0e3557d 100644
--- a/components/keyed_service/content/DEPS
+++ b/components/keyed_service/content/DEPS
@@ -1,4 +1,5 @@
 include_rules = [
+  "+components/pref_registry",
   "+components/user_prefs",
   "+content/public/browser",
   "+content/public/common",
diff --git a/components/keyed_service/content/browser_context_keyed_base_factory.cc b/components/keyed_service/content/browser_context_keyed_base_factory.cc
index 9a543cd..622f1c8 100644
--- a/components/keyed_service/content/browser_context_keyed_base_factory.cc
+++ b/components/keyed_service/content/browser_context_keyed_base_factory.cc
@@ -6,7 +6,7 @@
 
 #include "base/prefs/pref_service.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
-#include "components/user_prefs/pref_registry_syncable.h"
+#include "components/pref_registry/pref_registry_syncable.h"
 #include "components/user_prefs/user_prefs.h"
 #include "content/public/browser/browser_context.h"
 
diff --git a/components/password_manager/core/browser/DEPS b/components/password_manager/core/browser/DEPS
index ddba66f..3cb0b69 100644
--- a/components/password_manager/core/browser/DEPS
+++ b/components/password_manager/core/browser/DEPS
@@ -1,6 +1,5 @@
 include_rules = [
   "+components/autofill/core/browser",
   "+components/keyed_service/core",
-  "+components/user_prefs",
-  "+content/public/browser",
+  "+components/pref_registry",
 ]
diff --git a/components/password_manager/core/browser/password_manager.cc b/components/password_manager/core/browser/password_manager.cc
index 03e81d8..73c54ef1 100644
--- a/components/password_manager/core/browser/password_manager.cc
+++ b/components/password_manager/core/browser/password_manager.cc
@@ -19,7 +19,7 @@
 #include "components/password_manager/core/browser/password_manager_driver.h"
 #include "components/password_manager/core/browser/password_manager_metrics_util.h"
 #include "components/password_manager/core/common/password_manager_pref_names.h"
-#include "components/user_prefs/pref_registry_syncable.h"
+#include "components/pref_registry/pref_registry_syncable.h"
 
 using autofill::PasswordForm;
 using autofill::PasswordFormMap;
diff --git a/components/policy/core/browser/DEPS b/components/policy/core/browser/DEPS
index 9134e3a..73c708d 100644
--- a/components/policy/core/browser/DEPS
+++ b/components/policy/core/browser/DEPS
@@ -1,7 +1,7 @@
 include_rules = [
   "+components/autofill/core/common",
+  "+components/pref_registry",
   "+components/url_matcher",
-  "+components/user_prefs",
   "+grit/component_strings.h",
   "+third_party/icu",
   "+ui/base/l10n",
diff --git a/components/policy/core/browser/url_blacklist_manager.cc b/components/policy/core/browser/url_blacklist_manager.cc
index 0706080..b3b6a6d 100644
--- a/components/policy/core/browser/url_blacklist_manager.cc
+++ b/components/policy/core/browser/url_blacklist_manager.cc
@@ -15,7 +15,7 @@
 #include "base/task_runner_util.h"
 #include "base/values.h"
 #include "components/policy/core/common/policy_pref_names.h"
-#include "components/user_prefs/pref_registry_syncable.h"
+#include "components/pref_registry/pref_registry_syncable.h"
 #include "net/base/filename_util.h"
 #include "net/base/load_flags.h"
 #include "net/base/net_errors.h"
diff --git a/components/policy/policy_browser.gypi b/components/policy/policy_browser.gypi
index 82d70ae..cdd2fac 100644
--- a/components/policy/policy_browser.gypi
+++ b/components/policy/policy_browser.gypi
@@ -11,8 +11,8 @@
     '../ui/base/ui_base.gyp:ui_base',
     '../url/url.gyp:url_lib',
     'components_strings.gyp:components_strings',
+    'pref_registry',
     'url_matcher',
-    'user_prefs',
   ],
   'defines': [
     'POLICY_COMPONENT_IMPLEMENTATION',
diff --git a/components/pref_registry.gypi b/components/pref_registry.gypi
new file mode 100644
index 0000000..08dc387
--- /dev/null
+++ b/components/pref_registry.gypi
@@ -0,0 +1,29 @@
+# Copyright (c) 2013 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.
+
+{
+  'targets': [
+    {
+      'target_name': 'pref_registry',
+      'type': '<(component)',
+      'dependencies': [
+        '../base/base.gyp:base',
+        '../base/base.gyp:base_prefs',
+        '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
+        '../ui/base/ui_base.gyp:ui_base',
+      ],
+      'include_dirs': [
+        '..',
+      ],
+      'defines': [
+        'PREF_REGISTRY_IMPLEMENTATION',
+      ],
+      'sources': [
+        'pref_registry/pref_registry_export.h',
+        'pref_registry/pref_registry_syncable.cc',
+        'pref_registry/pref_registry_syncable.h',
+      ],
+    },
+  ],
+}
diff --git a/components/pref_registry/DEPS b/components/pref_registry/DEPS
new file mode 100644
index 0000000..e7cf2c6f
--- /dev/null
+++ b/components/pref_registry/DEPS
@@ -0,0 +1,3 @@
+include_rules = [
+  "+ui/base",
+]
diff --git a/components/pref_registry/OWNERS b/components/pref_registry/OWNERS
new file mode 100644
index 0000000..97ab695
--- /dev/null
+++ b/components/pref_registry/OWNERS
@@ -0,0 +1,5 @@
+battre@chromium.org
+bauerb@chromium.org
+gab@chromium.org
+mnissler@chromium.org
+pam@chromium.org
diff --git a/components/pref_registry/README b/components/pref_registry/README
new file mode 100644
index 0000000..041a103
--- /dev/null
+++ b/components/pref_registry/README
@@ -0,0 +1,6 @@
+The //components/pref_registry component provides:
+
+A place for PrefRegistrySyncable to live, where it can be used by
+components that need to register preferences associated with users.
+
+This component should not depend on content module.
diff --git a/components/pref_registry/pref_registry_export.h b/components/pref_registry/pref_registry_export.h
new file mode 100644
index 0000000..9ebbb1f
--- /dev/null
+++ b/components/pref_registry/pref_registry_export.h
@@ -0,0 +1,29 @@
+// 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.
+
+#ifndef COMPONENTS_PREF_REGISTRY_PREF_REGISTRY_EXPORT_H_
+#define COMPONENTS_PREF_REGISTRY_PREF_REGISTRY_EXPORT_H_
+
+#if defined(COMPONENT_BUILD)
+#if defined(WIN32)
+
+#if defined(PREF_REGISTRY_IMPLEMENTATION)
+#define PREF_REGISTRY_EXPORT __declspec(dllexport)
+#else
+#define PREF_REGISTRY_EXPORT __declspec(dllimport)
+#endif  // defined(PREF_REGISTRY_IMPLEMENTATION)
+
+#else  // defined(WIN32)
+#if defined(PREF_REGISTRY_IMPLEMENTATION)
+#define PREF_REGISTRY_EXPORT __attribute__((visibility("default")))
+#else
+#define PREF_REGISTRY_EXPORT
+#endif
+#endif
+
+#else  // defined(COMPONENT_BUILD)
+#define PREF_REGISTRY_EXPORT
+#endif
+
+#endif  // COMPONENTS_PREF_REGISTRY_PREF_REGISTRY_EXPORT_H_
diff --git a/components/user_prefs/pref_registry_syncable.cc b/components/pref_registry/pref_registry_syncable.cc
index b0e40a2..675b309 100644
--- a/components/user_prefs/pref_registry_syncable.cc
+++ b/components/pref_registry/pref_registry_syncable.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 "components/user_prefs/pref_registry_syncable.h"
+#include "components/pref_registry/pref_registry_syncable.h"
 
 #include "base/files/file_path.h"
 #include "base/prefs/default_pref_store.h"
diff --git a/components/user_prefs/pref_registry_syncable.h b/components/pref_registry/pref_registry_syncable.h
index 64de0a3..57deda6 100644
--- a/components/user_prefs/pref_registry_syncable.h
+++ b/components/pref_registry/pref_registry_syncable.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef COMPONENTS_USER_PREFS_PREF_REGISTRY_SYNCABLE_H_
-#define COMPONENTS_USER_PREFS_PREF_REGISTRY_SYNCABLE_H_
+#ifndef COMPONENTS_PREF_REGISTRY_PREF_REGISTRY_SYNCABLE_H_
+#define COMPONENTS_PREF_REGISTRY_PREF_REGISTRY_SYNCABLE_H_
 
 #include <set>
 #include <string>
 
 #include "base/callback.h"
 #include "base/prefs/pref_registry.h"
-#include "components/user_prefs/user_prefs_export.h"
+#include "components/pref_registry/pref_registry_export.h"
 
 namespace base {
 class DictionaryValue;
@@ -19,6 +19,7 @@ class ListValue;
 class Value;
 }
 
+// TODO(tfarina): Change this namespace to pref_registry.
 namespace user_prefs {
 
 // A PrefRegistry that forces users to choose whether each registered
@@ -31,7 +32,7 @@ namespace user_prefs {
 // appropriate time before the PrefService for these preferences is
 // constructed. See e.g. chrome/browser/prefs/browser_prefs.cc which
 // does this for Chrome.
-class USER_PREFS_EXPORT PrefRegistrySyncable : public PrefRegistry {
+class PREF_REGISTRY_EXPORT PrefRegistrySyncable : public PrefRegistry {
  public:
   // Enum used when registering preferences to determine if it should
   // be synced or not. Syncable priority preferences are preferences that are
@@ -129,4 +130,4 @@ class USER_PREFS_EXPORT PrefRegistrySyncable : public PrefRegistry {
 
 }  // namespace user_prefs
 
-#endif  // COMPONENTS_USER_PREFS_PREF_REGISTRY_SYNCABLE_H_
+#endif  // COMPONENTS_PREF_REGISTRY_PREF_REGISTRY_SYNCABLE_H_
diff --git a/components/sync_driver/DEPS b/components/sync_driver/DEPS
index 1a20824..c42e59f 100644
--- a/components/sync_driver/DEPS
+++ b/components/sync_driver/DEPS
@@ -1,5 +1,5 @@
 include_rules = [
   "+components/os_crypt",
-  "+components/user_prefs/pref_registry_syncable.h",
+  "+components/pref_registry/pref_registry_syncable.h",
   "+sync",
 ]
diff --git a/components/sync_driver/sync_prefs.cc b/components/sync_driver/sync_prefs.cc
index 9d34236..9bdd817 100644
--- a/components/sync_driver/sync_prefs.cc
+++ b/components/sync_driver/sync_prefs.cc
@@ -11,8 +11,8 @@
 #include "base/strings/string_number_conversions.h"
 #include "base/values.h"
 #include "build/build_config.h"
+#include "components/pref_registry/pref_registry_syncable.h"
 #include "components/sync_driver/pref_names.h"
-#include "components/user_prefs/pref_registry_syncable.h"
 
 namespace sync_driver {
 
diff --git a/components/sync_driver/sync_prefs_unittest.cc b/components/sync_driver/sync_prefs_unittest.cc
index 5396057..8a5608a 100644
--- a/components/sync_driver/sync_prefs_unittest.cc
+++ b/components/sync_driver/sync_prefs_unittest.cc
@@ -10,8 +10,8 @@
 #include "base/prefs/pref_value_store.h"
 #include "base/prefs/testing_pref_service.h"
 #include "base/time/time.h"
+#include "components/pref_registry/pref_registry_syncable.h"
 #include "components/sync_driver/pref_names.h"
-#include "components/user_prefs/pref_registry_syncable.h"
 #include "sync/internal_api/public/base/model_type.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
diff --git a/components/translate.gypi b/components/translate.gypi
index 295ab96fcd..00ec959 100644
--- a/components/translate.gypi
+++ b/components/translate.gypi
@@ -15,8 +15,8 @@
         '../url/url.gyp:url_lib',
         'components_resources.gyp:components_resources',
         'language_usage_metrics',
+        'pref_registry',
         'translate_core_common',
-        'user_prefs',
       ],
       'include_dirs': [
         '..',
diff --git a/components/translate/DEPS b/components/translate/DEPS
index df3f959..e13509a 100644
--- a/components/translate/DEPS
+++ b/components/translate/DEPS
@@ -1,6 +1,6 @@
 include_rules = [
   "+components/language_usage_metrics",
-  "+components/user_prefs",
+  "+components/pref_registry",
   "+google_apis",
   "+grit",  # For generated headers.
   "+net",
diff --git a/components/translate/core/browser/translate_prefs.cc b/components/translate/core/browser/translate_prefs.cc
index 646b8d5..bb8dd743 100644
--- a/components/translate/core/browser/translate_prefs.cc
+++ b/components/translate/core/browser/translate_prefs.cc
@@ -10,10 +10,10 @@
 #include "base/prefs/scoped_user_pref_update.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
+#include "components/pref_registry/pref_registry_syncable.h"
 #include "components/translate/core/browser/translate_accept_languages.h"
 #include "components/translate/core/browser/translate_download_manager.h"
 #include "components/translate/core/common/translate_util.h"
-#include "components/user_prefs/pref_registry_syncable.h"
 
 const char TranslatePrefs::kPrefTranslateLanguageBlacklist[] =
     "translate_language_blacklist";
diff --git a/components/user_prefs.gypi b/components/user_prefs.gypi
index a5c62ac..a94323e 100644
--- a/components/user_prefs.gypi
+++ b/components/user_prefs.gypi
@@ -12,7 +12,6 @@
         '../base/base.gyp:base_prefs',
         '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '../content/content.gyp:content_browser',
-        '../ui/base/ui_base.gyp:ui_base',
       ],
       'include_dirs': [
         '..',
@@ -21,8 +20,6 @@
         'USER_PREFS_IMPLEMENTATION',
       ],
       'sources': [
-        'user_prefs/pref_registry_syncable.cc',
-        'user_prefs/pref_registry_syncable.h',
         'user_prefs/user_prefs.cc',
         'user_prefs/user_prefs.h',
         'user_prefs/user_prefs_export.h',
diff --git a/components/user_prefs/DEPS b/components/user_prefs/DEPS
index c36190b..1c35d9c 100644
--- a/components/user_prefs/DEPS
+++ b/components/user_prefs/DEPS
@@ -1,4 +1,3 @@
 include_rules = [
   "+content/public/browser",
-  "+ui/base",
 ]
diff --git a/components/user_prefs/user_prefs_export.h b/components/user_prefs/user_prefs_export.h
index 3d20222..af7c0f9 100644
--- a/components/user_prefs/user_prefs_export.h
+++ b/components/user_prefs/user_prefs_export.h
@@ -12,7 +12,7 @@
 #define USER_PREFS_EXPORT __declspec(dllexport)
 #else
 #define USER_PREFS_EXPORT __declspec(dllimport)
-#endif  // defined(BASE_PREFS_IMPLEMENTATION)
+#endif  // defined(USER_PREFS_IMPLEMENTATION)
 
 #else  // defined(WIN32)
 #if defined(USER_PREFS_IMPLEMENTATION)