| Index: chrome/browser/extensions/api/preference/preference_api.cc
|
| diff --git a/chrome/browser/extensions/api/preference/preference_api.cc b/chrome/browser/extensions/api/preference/preference_api.cc
|
| index 93f1c97ad1ebc40b998a60d5009c539d40001cd8..b72bbb366f60b9d199f2fd07552c9b51a881c4e4 100644
|
| --- a/chrome/browser/extensions/api/preference/preference_api.cc
|
| +++ b/chrome/browser/extensions/api/preference/preference_api.cc
|
| @@ -400,17 +400,18 @@ void PreferenceAPI::Shutdown() {
|
| extension_prefs()->content_settings_store()->RemoveObserver(this);
|
| }
|
|
|
| -static base::LazyInstance<ProfileKeyedAPIFactory<PreferenceAPI> >
|
| -g_factory = LAZY_INSTANCE_INITIALIZER;
|
| +static base::LazyInstance<BrowserContextKeyedAPIFactory<PreferenceAPI> >
|
| + g_factory = LAZY_INSTANCE_INITIALIZER;
|
|
|
| // static
|
| -ProfileKeyedAPIFactory<PreferenceAPI>* PreferenceAPI::GetFactoryInstance() {
|
| +BrowserContextKeyedAPIFactory<PreferenceAPI>*
|
| +PreferenceAPI::GetFactoryInstance() {
|
| return g_factory.Pointer();
|
| }
|
|
|
| // static
|
| PreferenceAPI* PreferenceAPI::Get(content::BrowserContext* context) {
|
| - return ProfileKeyedAPIFactory<PreferenceAPI>::GetForProfile(context);
|
| + return BrowserContextKeyedAPIFactory<PreferenceAPI>::Get(context);
|
| }
|
|
|
| void PreferenceAPI::OnListenerAdded(const EventListenerInfo& details) {
|
| @@ -530,7 +531,8 @@ ExtensionPrefValueMap* PreferenceAPI::extension_pref_value_map() {
|
| }
|
|
|
| template <>
|
| -void ProfileKeyedAPIFactory<PreferenceAPI>::DeclareFactoryDependencies() {
|
| +void
|
| +BrowserContextKeyedAPIFactory<PreferenceAPI>::DeclareFactoryDependencies() {
|
| DependsOn(ExtensionPrefsFactory::GetInstance());
|
| DependsOn(ExtensionPrefValueMapFactory::GetInstance());
|
| DependsOn(ExtensionsBrowserClient::Get()->GetExtensionSystemFactory());
|
|
|