| Index: chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc
|
| diff --git a/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc b/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc
|
| index b153dfdcf1874cc91544080d3ac91febb5c4d11a..6ca34e64a9a196a2ea51bbc12f6ea7995f47f4ee 100644
|
| --- a/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc
|
| +++ b/chrome/browser/extensions/api/preference/chrome_direct_setting_api.cc
|
| @@ -72,8 +72,9 @@ class PreferenceWhitelist {
|
| base::LazyInstance<PreferenceWhitelist> preference_whitelist =
|
| LAZY_INSTANCE_INITIALIZER;
|
|
|
| -static base::LazyInstance<ProfileKeyedAPIFactory<ChromeDirectSettingAPI> >
|
| - g_factory = LAZY_INSTANCE_INITIALIZER;
|
| +static base::LazyInstance<
|
| + BrowserContextKeyedAPIFactory<ChromeDirectSettingAPI> > g_factory =
|
| + LAZY_INSTANCE_INITIALIZER;
|
|
|
| ChromeDirectSettingAPI::ChromeDirectSettingAPI(content::BrowserContext* context)
|
| : profile_(Profile::FromBrowserContext(context)) {
|
| @@ -85,9 +86,9 @@ ChromeDirectSettingAPI::~ChromeDirectSettingAPI() {}
|
| // BrowserContextKeyedService implementation.
|
| void ChromeDirectSettingAPI::Shutdown() {}
|
|
|
| -// ProfileKeyedAPI implementation.
|
| -ProfileKeyedAPIFactory<ChromeDirectSettingAPI>*
|
| - ChromeDirectSettingAPI::GetFactoryInstance() {
|
| +// BrowserContextKeyedAPI implementation.
|
| +BrowserContextKeyedAPIFactory<ChromeDirectSettingAPI>*
|
| +ChromeDirectSettingAPI::GetFactoryInstance() {
|
| return g_factory.Pointer();
|
| }
|
|
|
| @@ -110,10 +111,10 @@ bool ChromeDirectSettingAPI::IsPreferenceOnWhitelist(
|
|
|
| ChromeDirectSettingAPI* ChromeDirectSettingAPI::Get(
|
| content::BrowserContext* context) {
|
| - return ProfileKeyedAPIFactory<ChromeDirectSettingAPI>::GetForProfile(context);
|
| + return BrowserContextKeyedAPIFactory<ChromeDirectSettingAPI>::Get(context);
|
| }
|
|
|
| -// ProfileKeyedAPI implementation.
|
| +// BrowserContextKeyedAPI implementation.
|
| const char* ChromeDirectSettingAPI::service_name() {
|
| return "ChromeDirectSettingAPI";
|
| }
|
|
|