Reland 124817 - Take extensions out of Profile into a profile-keyed service, ExtensionSystem.

chrome/browser/automation/automation_provider.cc

Index: chrome/browser/automation/automation_provider.cc
diff --git a/chrome/browser/automation/automation_provider.cc b/chrome/browser/automation/automation_provider.cc
index 5a42b09778cb8d2ae992bc36cbf4f78534fc8c9c..73dbc36df89120664dd7ba6a2cc007517a3d2a5e 100644
--- a/chrome/browser/automation/automation_provider.cc
+++ b/chrome/browser/automation/automation_provider.cc
@@ -47,6 +47,8 @@
 #include "chrome/browser/extensions/extension_install_ui.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/extensions/extension_service.h"
+#include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/extension_toolbar_model.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
@@ -926,7 +928,7 @@ void AutomationProvider::ExecuteExtensionActionInActiveTabAsync(
   const Extension* extension = GetEnabledExtension(extension_handle);
   ExtensionService* service = profile_->GetExtensionService();
   ExtensionMessageService* message_service =
-      profile_->GetExtensionMessageService();
+      ExtensionSystemFactory::GetForProfile(profile_)->message_service();
   Browser* browser = browser_tracker_->GetResource(browser_handle);
   if (extension && service && message_service && browser) {
     int tab_id = ExtensionTabUtil::GetTabId(browser->GetSelectedWebContents());