| Index: chrome/browser/profiles/profile_impl.cc
|
| diff --git a/chrome/browser/profiles/profile_impl.cc b/chrome/browser/profiles/profile_impl.cc
|
| index fc5c3f6efc1cb9c75d3a61ca64ec42cfe0f3fc86..8adabb9cc27104685045756ffb24fe7037fbd51f 100644
|
| --- a/chrome/browser/profiles/profile_impl.cc
|
| +++ b/chrome/browser/profiles/profile_impl.cc
|
| @@ -51,6 +51,8 @@
|
| #include "chrome/browser/plugins/plugin_prefs.h"
|
| #include "chrome/browser/policy/profile_policy_connector.h"
|
| #include "chrome/browser/policy/profile_policy_connector_factory.h"
|
| +#include "chrome/browser/policy/schema_registry_service.h"
|
| +#include "chrome/browser/policy/schema_registry_service_factory.h"
|
| #include "chrome/browser/prefs/browser_prefs.h"
|
| #include "chrome/browser/prefs/chrome_pref_service_factory.h"
|
| #include "chrome/browser/prefs/pref_service_syncable_util.h"
|
| @@ -87,6 +89,7 @@
|
| #include "components/keyed_service/content/browser_context_dependency_manager.h"
|
| #include "components/metrics/metrics_service.h"
|
| #include "components/omnibox/browser/autocomplete_classifier.h"
|
| +#include "components/policy/core/browser/browser_policy_connector.h"
|
| #include "components/pref_registry/pref_registry_syncable.h"
|
| #include "components/prefs/json_pref_store.h"
|
| #include "components/prefs/scoped_user_pref_update.h"
|
| @@ -126,10 +129,6 @@
|
| #include "chrome/browser/background/background_mode_manager.h"
|
| #endif
|
|
|
| -#if defined(ENABLE_CONFIGURATION_POLICY)
|
| -#include "chrome/browser/policy/schema_registry_service.h"
|
| -#include "chrome/browser/policy/schema_registry_service_factory.h"
|
| -#include "components/policy/core/browser/browser_policy_connector.h"
|
| #if defined(OS_CHROMEOS)
|
| #include "chrome/browser/chromeos/login/session/user_session_manager.h"
|
| #include "chrome/browser/chromeos/policy/user_cloud_policy_manager_chromeos.h"
|
| @@ -138,7 +137,6 @@
|
| #include "chrome/browser/policy/cloud/user_cloud_policy_manager_factory.h"
|
| #include "components/policy/core/common/cloud/user_cloud_policy_manager.h"
|
| #endif
|
| -#endif
|
|
|
| #if defined(ENABLE_EXTENSIONS)
|
| #include "chrome/browser/extensions/extension_service.h"
|
| @@ -407,7 +405,6 @@ ProfileImpl::ProfileImpl(
|
| // If we are creating the profile synchronously, then we should load the
|
| // policy data immediately.
|
| bool force_immediate_policy_load = (create_mode == CREATE_MODE_SYNCHRONOUS);
|
| -#if defined(ENABLE_CONFIGURATION_POLICY)
|
| policy::BrowserPolicyConnector* connector =
|
| g_browser_process->browser_policy_connector();
|
| schema_registry_service_ =
|
| @@ -426,7 +423,6 @@ ProfileImpl::ProfileImpl(
|
| BrowserThread::GetMessageLoopProxyForThread(BrowserThread::FILE),
|
| BrowserThread::GetMessageLoopProxyForThread(BrowserThread::IO));
|
| #endif
|
| -#endif
|
| profile_policy_connector_ =
|
| policy::ProfilePolicyConnectorFactory::CreateForBrowserContext(
|
| this, force_immediate_policy_load);
|
|
|