| 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 b0293f44a1bec939dba877928d5afac4ac55b852..37cb2e316a7762be1ec2b9757865ae37dd1cbeee 100644
|
| --- a/chrome/browser/automation/testing_automation_provider.cc
|
| +++ b/chrome/browser/automation/testing_automation_provider.cc
|
| @@ -3452,15 +3452,13 @@ void TestingAutomationProvider::InstallExtension(
|
| }
|
| args->GetBoolean("from_webstore", &from_webstore);
|
|
|
| - ExtensionService* service = extensions::ExtensionSystem::Get(
|
| - browser->profile())->extension_service();
|
| - extensions::ProcessManager* manager =
|
| - extensions::ExtensionSystem::Get(browser->profile())->process_manager();
|
| - if (service && manager) {
|
| + extensions::ExtensionSystem* system =
|
| + extensions::ExtensionSystem::Get(browser->profile());
|
| + ExtensionService* service = system->extension_service();
|
| + if (service) {
|
| // The observer will delete itself when done.
|
| new ExtensionReadyNotificationObserver(
|
| - manager,
|
| - service,
|
| + system,
|
| this,
|
| reply_message);
|
|
|
| @@ -3486,7 +3484,7 @@ void TestingAutomationProvider::InstallExtension(
|
| }
|
| } else {
|
| AutomationJSONReply(this, reply_message).SendError(
|
| - "Extensions service/process manager is not available");
|
| + "Extensions service is not available");
|
| }
|
| }
|
|
|
| @@ -3666,21 +3664,19 @@ void TestingAutomationProvider::SetExtensionStateById(
|
| return;
|
| }
|
|
|
| - ExtensionService* service = extensions::ExtensionSystem::Get(
|
| - browser->profile())->extension_service();
|
| - extensions::ProcessManager* manager =
|
| - extensions::ExtensionSystem::Get(browser->profile())->process_manager();
|
| + extensions::ExtensionSystem* system =
|
| + extensions::ExtensionSystem::Get(browser->profile());
|
| + ExtensionService* service = system->extension_service();
|
| if (!service) {
|
| AutomationJSONReply(this, reply_message)
|
| - .SendError("No extensions service or process manager.");
|
| + .SendError("No extensions service.");
|
| return;
|
| }
|
|
|
| if (enable) {
|
| if (!service->IsExtensionEnabled(extension->id())) {
|
| new ExtensionReadyNotificationObserver(
|
| - manager,
|
| - service,
|
| + system,
|
| this,
|
| reply_message);
|
| service->EnableExtension(extension->id());
|
|
|