| Index: android_webview/browser/aw_browser_context.cc
|
| diff --git a/android_webview/browser/aw_browser_context.cc b/android_webview/browser/aw_browser_context.cc
|
| index 0003e2e1520da5817556ab680dd4b44ed912d961..a5e985f42571a865849abf71da195c62f5e28fc7 100644
|
| --- a/android_webview/browser/aw_browser_context.cc
|
| +++ b/android_webview/browser/aw_browser_context.cc
|
| @@ -20,8 +20,6 @@
|
| #include "base/base_paths_android.h"
|
| #include "base/bind.h"
|
| #include "base/path_service.h"
|
| -#include "base/prefs/pref_service.h"
|
| -#include "base/prefs/pref_service_factory.h"
|
| #include "components/autofill/core/common/autofill_pref_names.h"
|
| #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_compression_stats.h"
|
| #include "components/data_reduction_proxy/core/browser/data_reduction_proxy_io_data.h"
|
| @@ -35,6 +33,8 @@
|
| #include "components/policy/core/browser/configuration_policy_pref_store.h"
|
| #include "components/policy/core/browser/url_blacklist_manager.h"
|
| #include "components/pref_registry/pref_registry_syncable.h"
|
| +#include "components/prefs/pref_service.h"
|
| +#include "components/prefs/pref_service_factory.h"
|
| #include "components/url_formatter/url_fixer.h"
|
| #include "components/user_prefs/user_prefs.h"
|
| #include "components/visitedlink/browser/visitedlink_master.h"
|
| @@ -347,7 +347,7 @@ void AwBrowserContext::InitUserPrefService() {
|
|
|
| metrics::MetricsService::RegisterPrefs(pref_registry);
|
|
|
| - base::PrefServiceFactory pref_service_factory;
|
| + PrefServiceFactory pref_service_factory;
|
| pref_service_factory.set_user_prefs(make_scoped_refptr(new AwPrefStore()));
|
| pref_service_factory.set_managed_prefs(
|
| make_scoped_refptr(new policy::ConfigurationPolicyPrefStore(
|
|
|