| Index: chrome/browser/prefs/chrome_pref_service_factory.h
|
| diff --git a/chrome/browser/prefs/chrome_pref_service_factory.h b/chrome/browser/prefs/chrome_pref_service_factory.h
|
| index 7c308ebfa56d2f78ccaacb86805a9fe4fb26411b..eb6b4fce2cc0a80a2f0b4e0dcc4a399e877135d6 100644
|
| --- a/chrome/browser/prefs/chrome_pref_service_factory.h
|
| +++ b/chrome/browser/prefs/chrome_pref_service_factory.h
|
| @@ -16,15 +16,16 @@ namespace policy {
|
| class PolicyService;
|
| }
|
|
|
| +namespace user_prefs {
|
| +class PrefRegistrySyncable;
|
| +}
|
| +
|
| +class ManagedUserSettingsService;
|
| class PrefRegistry;
|
| class PrefService;
|
| class PrefServiceSyncable;
|
| class PrefStore;
|
|
|
| -namespace user_prefs {
|
| -class PrefRegistrySyncable;
|
| -}
|
| -
|
| namespace chrome_prefs {
|
|
|
| // Factory methods that create and initialize a new instance of a
|
| @@ -46,7 +47,6 @@ PrefService* CreateLocalState(
|
| const base::FilePath& pref_filename,
|
| base::SequencedTaskRunner* pref_io_task_runner,
|
| policy::PolicyService* policy_service,
|
| - const scoped_refptr<PrefStore>& extension_prefs,
|
| const scoped_refptr<PrefRegistry>& pref_registry,
|
| bool async);
|
|
|
| @@ -54,6 +54,7 @@ PrefServiceSyncable* CreateProfilePrefs(
|
| const base::FilePath& pref_filename,
|
| base::SequencedTaskRunner* pref_io_task_runner,
|
| policy::PolicyService* policy_service,
|
| + ManagedUserSettingsService* managed_user_settings,
|
| const scoped_refptr<PrefStore>& extension_prefs,
|
| const scoped_refptr<user_prefs::PrefRegistrySyncable>& pref_registry,
|
| bool async);
|
|
|