| Index: chrome/browser/custom_handlers/protocol_handler_registry_factory.cc
|
| diff --git a/chrome/browser/custom_handlers/protocol_handler_registry_factory.cc b/chrome/browser/custom_handlers/protocol_handler_registry_factory.cc
|
| index 5e21cfc25b9358310747c5979a48ef91e14006d9..be49e4e1dff98c80b5dee9e34c4c82a907abc484 100644
|
| --- a/chrome/browser/custom_handlers/protocol_handler_registry_factory.cc
|
| +++ b/chrome/browser/custom_handlers/protocol_handler_registry_factory.cc
|
| @@ -20,12 +20,13 @@ ProtocolHandlerRegistryFactory* ProtocolHandlerRegistryFactory::GetInstance() {
|
| ProtocolHandlerRegistry* ProtocolHandlerRegistryFactory::GetForProfile(
|
| Profile* profile) {
|
| return static_cast<ProtocolHandlerRegistry*>(
|
| - GetInstance()->GetServiceForProfile(profile, true));
|
| + GetInstance()->GetServiceForBrowserContext(profile, true));
|
| }
|
|
|
| ProtocolHandlerRegistryFactory::ProtocolHandlerRegistryFactory()
|
| - : ProfileKeyedServiceFactory("ProtocolHandlerRegistry",
|
| - ProfileDependencyManager::GetInstance()) {
|
| + : BrowserContextKeyedServiceFactory(
|
| + "ProtocolHandlerRegistry",
|
| + BrowserContextDependencyManager::GetInstance()) {
|
| }
|
|
|
| ProtocolHandlerRegistryFactory::~ProtocolHandlerRegistryFactory() {
|
| @@ -34,7 +35,8 @@ ProtocolHandlerRegistryFactory::~ProtocolHandlerRegistryFactory() {
|
| // Will be created when initializing profile_io_data, so we might
|
| // as well have the framework create this along with other
|
| // PKSs to preserve orderly civic conduct :)
|
| -bool ProtocolHandlerRegistryFactory::ServiceIsCreatedWithProfile() const {
|
| +bool
|
| +ProtocolHandlerRegistryFactory::ServiceIsCreatedWithBrowserContext() const {
|
| return true;
|
| }
|
|
|
| @@ -51,7 +53,8 @@ bool ProtocolHandlerRegistryFactory::ServiceIsNULLWhileTesting() const {
|
| return true;
|
| }
|
|
|
| -ProfileKeyedService* ProtocolHandlerRegistryFactory::BuildServiceInstanceFor(
|
| +BrowserContextKeyedService*
|
| +ProtocolHandlerRegistryFactory::BuildServiceInstanceFor(
|
| content::BrowserContext* profile) const {
|
| ProtocolHandlerRegistry* registry = new ProtocolHandlerRegistry(
|
| static_cast<Profile*>(profile), new ProtocolHandlerRegistry::Delegate());
|
|
|