| Index: chrome/browser/extensions/extension_message_service.cc
|
| diff --git a/chrome/browser/extensions/extension_message_service.cc b/chrome/browser/extensions/extension_message_service.cc
|
| index d04152758c6da5a6d9657ccf3b85ba8efc39b9b4..c522eaf8dabd22fb94ec6f3108f9f587fc09d2d4 100644
|
| --- a/chrome/browser/extensions/extension_message_service.cc
|
| +++ b/chrome/browser/extensions/extension_message_service.cc
|
| @@ -126,7 +126,7 @@ static content::RenderProcessHost* GetExtensionProcess(
|
| Profile* profile, const std::string& extension_id) {
|
| SiteInstance* site_instance =
|
| profile->GetExtensionProcessManager()->GetSiteInstanceForURL(
|
| - Extension::GetBaseURLFromExtensionId(extension_id));
|
| + extensions::Extension::GetBaseURLFromExtensionId(extension_id));
|
|
|
| if (!site_instance->HasProcess())
|
| return NULL;
|
| @@ -430,7 +430,8 @@ bool ExtensionMessageService::MaybeAddPendingOpenChannelTask(
|
| const OpenChannelParams& params) {
|
| ExtensionService* service = profile->GetExtensionService();
|
| const std::string& extension_id = params.target_extension_id;
|
| - const Extension* extension = service->extensions()->GetByID(extension_id);
|
| + const extensions::Extension* extension = service->extensions()->GetByID(
|
| + extension_id);
|
| if (extension && extension->has_lazy_background_page()) {
|
| // If the extension uses spanning incognito mode, make sure we're always
|
| // using the original profile since that is what the extension process
|
|
|