| Index: chrome/browser/prefs/chrome_pref_service_factory.cc
|
| diff --git a/chrome/browser/prefs/chrome_pref_service_factory.cc b/chrome/browser/prefs/chrome_pref_service_factory.cc
|
| index 2472dee685c2c072dbd94a7445a6a3c2d92bf98d..4e3874e4cab0c50c138c3dfee247307aa9fb175f 100644
|
| --- a/chrome/browser/prefs/chrome_pref_service_factory.cc
|
| +++ b/chrome/browser/prefs/chrome_pref_service_factory.cc
|
| @@ -31,6 +31,8 @@
|
| #include "chrome/grit/chromium_strings.h"
|
| #include "chrome/grit/generated_resources.h"
|
| #include "components/component_updater/pref_names.h"
|
| +#include "components/policy/core/browser/browser_policy_connector.h"
|
| +#include "components/policy/core/browser/configuration_policy_pref_store.h"
|
| #include "components/pref_registry/pref_registry_syncable.h"
|
| #include "components/prefs/default_pref_store.h"
|
| #include "components/prefs/json_pref_store.h"
|
| @@ -56,11 +58,6 @@
|
| #include "sync/internal_api/public/base/model_type.h"
|
| #include "ui/base/resource/resource_bundle.h"
|
|
|
| -#if defined(ENABLE_CONFIGURATION_POLICY)
|
| -#include "components/policy/core/browser/browser_policy_connector.h"
|
| -#include "components/policy/core/browser/configuration_policy_pref_store.h"
|
| -#endif
|
| -
|
| #if defined(ENABLE_EXTENSIONS)
|
| #include "extensions/browser/pref_names.h"
|
| #endif
|
| @@ -426,12 +423,10 @@ void PrepareFactory(
|
| scoped_refptr<PersistentPrefStore> user_pref_store,
|
| const scoped_refptr<PrefStore>& extension_prefs,
|
| bool async) {
|
| -#if defined(ENABLE_CONFIGURATION_POLICY)
|
| policy::BrowserPolicyConnector* policy_connector =
|
| g_browser_process->browser_policy_connector();
|
| factory->SetManagedPolicies(policy_service, policy_connector);
|
| factory->SetRecommendedPolicies(policy_service, policy_connector);
|
| -#endif // ENABLE_CONFIGURATION_POLICY
|
|
|
| #if defined(ENABLE_SUPERVISED_USERS)
|
| if (supervised_user_settings) {
|
|
|