| Index: chrome/browser/plugins/plugin_prefs_factory.cc
|
| diff --git a/chrome/browser/plugins/plugin_prefs_factory.cc b/chrome/browser/plugins/plugin_prefs_factory.cc
|
| index ab60dc11ab178c30d6a1f33dd4f1fcadd4c04bc8..a5cb5cc6ccb82c3e26f35eb70703a59ab451ca8e 100644
|
| --- a/chrome/browser/plugins/plugin_prefs_factory.cc
|
| +++ b/chrome/browser/plugins/plugin_prefs_factory.cc
|
| @@ -24,24 +24,24 @@ PluginPrefsFactory* PluginPrefsFactory::GetInstance() {
|
| scoped_refptr<PluginPrefs> PluginPrefsFactory::GetPrefsForProfile(
|
| Profile* profile) {
|
| return static_cast<PluginPrefs*>(
|
| - GetInstance()->GetServiceForProfile(profile, true).get());
|
| + GetInstance()->GetServiceForBrowserContext(profile, true).get());
|
| }
|
|
|
| // static
|
| -scoped_refptr<RefcountedProfileKeyedService>
|
| +scoped_refptr<RefcountedBrowserContextKeyedService>
|
| PluginPrefsFactory::CreateForTestingProfile(content::BrowserContext* profile) {
|
| return static_cast<PluginPrefs*>(
|
| GetInstance()->BuildServiceInstanceFor(profile).get());
|
| }
|
|
|
| PluginPrefsFactory::PluginPrefsFactory()
|
| - : RefcountedProfileKeyedServiceFactory(
|
| - "PluginPrefs", ProfileDependencyManager::GetInstance()) {
|
| + : RefcountedBrowserContextKeyedServiceFactory(
|
| + "PluginPrefs", BrowserContextDependencyManager::GetInstance()) {
|
| }
|
|
|
| PluginPrefsFactory::~PluginPrefsFactory() {}
|
|
|
| -scoped_refptr<RefcountedProfileKeyedService>
|
| +scoped_refptr<RefcountedBrowserContextKeyedService>
|
| PluginPrefsFactory::BuildServiceInstanceFor(
|
| content::BrowserContext* context) const {
|
| Profile* profile = static_cast<Profile*>(context);
|
| @@ -94,6 +94,6 @@ bool PluginPrefsFactory::ServiceIsNULLWhileTesting() const {
|
| return true;
|
| }
|
|
|
| -bool PluginPrefsFactory::ServiceIsCreatedWithProfile() const {
|
| +bool PluginPrefsFactory::ServiceIsCreatedWithBrowserContext() const {
|
| return true;
|
| }
|
|
|