Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(84)

Unified Diff: chrome/browser/automation/testing_automation_provider.cc

Issue 131743021: app_shell: Extract extension runtime data from ExtensionService (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase, RuntimeDataTest tweak, win warning Created 6 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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 7bf01266e74658e1540a797a6713bf4cf6c559c5..15706b08dbab51d73b138251dd12e0f2ae3e5ec4 100644
--- a/chrome/browser/automation/testing_automation_provider.cc
+++ b/chrome/browser/automation/testing_automation_provider.cc
@@ -3446,15 +3446,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);
@@ -3480,7 +3478,7 @@ void TestingAutomationProvider::InstallExtension(
}
} else {
AutomationJSONReply(this, reply_message).SendError(
- "Extensions service/process manager is not available");
+ "Extensions service is not available");
}
}
@@ -3660,21 +3658,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());

Powered by Google App Engine
This is Rietveld 408576698