| Index: chrome/browser/automation/testing_automation_provider.cc
|
| diff --git a/chrome/browser/automation/testing_automation_provider.cc b/chrome/browser/automation/testing_automation_provider.cc
|
| index 98cf4139d0235de45cebfa14d3f4a18694ee65a6..c7dad1e53d95917a7c41df26c81ba4a4aaa6d2e0 100644
|
| --- a/chrome/browser/automation/testing_automation_provider.cc
|
| +++ b/chrome/browser/automation/testing_automation_provider.cc
|
| @@ -3693,7 +3693,8 @@ void TestingAutomationProvider::InstallExtension(
|
| }
|
| args->GetBoolean("from_webstore", &from_webstore);
|
|
|
| - ExtensionService* service = browser->profile()->GetExtensionService();
|
| + ExtensionService* service = extensions::ExtensionSystem::Get(
|
| + browser->profile())->extension_service();
|
| ExtensionProcessManager* manager =
|
| extensions::ExtensionSystem::Get(browser->profile())->process_manager();
|
| if (service && manager) {
|
| @@ -3774,7 +3775,8 @@ void TestingAutomationProvider::GetExtensionsInfo(DictionaryValue* args,
|
| reply.SendError(error_msg);
|
| return;
|
| }
|
| - ExtensionService* service = browser->profile()->GetExtensionService();
|
| + ExtensionService* service = extensions::ExtensionSystem::Get(
|
| + browser->profile())->extension_service();
|
| if (!service) {
|
| reply.SendError("No extensions service.");
|
| return;
|
| @@ -3849,7 +3851,8 @@ void TestingAutomationProvider::UninstallExtensionById(
|
| AutomationJSONReply(this, reply_message).SendError(error);
|
| return;
|
| }
|
| - ExtensionService* service = browser->profile()->GetExtensionService();
|
| + ExtensionService* service = extensions::ExtensionSystem::Get(
|
| + browser->profile())->extension_service();
|
| if (!service) {
|
| AutomationJSONReply(this, reply_message).SendError(
|
| "No extensions service.");
|
| @@ -3901,7 +3904,8 @@ void TestingAutomationProvider::SetExtensionStateById(
|
| return;
|
| }
|
|
|
| - ExtensionService* service = browser->profile()->GetExtensionService();
|
| + ExtensionService* service = extensions::ExtensionSystem::Get(
|
| + browser->profile())->extension_service();
|
| ExtensionProcessManager* manager =
|
| extensions::ExtensionSystem::Get(browser->profile())->process_manager();
|
| if (!service) {
|
| @@ -4117,7 +4121,8 @@ void TestingAutomationProvider::UpdateExtensionsNow(
|
| AutomationJSONReply(this, reply_message).SendError(error);
|
| return;
|
| }
|
| - ExtensionService* service = browser->profile()->GetExtensionService();
|
| + ExtensionService* service = extensions::ExtensionSystem::Get(
|
| + browser->profile())->extension_service();
|
| if (!service) {
|
| AutomationJSONReply(this, reply_message).SendError(
|
| "No extensions service.");
|
| @@ -5014,7 +5019,8 @@ void TestingAutomationProvider::LaunchApp(
|
| return;
|
| }
|
|
|
| - ExtensionService* service = browser->profile()->GetExtensionService();
|
| + ExtensionService* service = extensions::ExtensionSystem::Get(
|
| + browser->profile())->extension_service();
|
| if (!service) {
|
| AutomationJSONReply(this, reply_message).SendError(
|
| "No extensions service.");
|
| @@ -5072,7 +5078,8 @@ void TestingAutomationProvider::SetAppLaunchType(
|
| return;
|
| }
|
|
|
| - ExtensionService* service = browser->profile()->GetExtensionService();
|
| + ExtensionService* service = extensions::ExtensionSystem::Get(
|
| + browser->profile())->extension_service();
|
| if (!service) {
|
| reply.SendError("No extensions service.");
|
| return;
|
|
|