Reland 125805 - Reland 124817 - A profile-keyed service for Extensions, ExtensionSystem.

chrome/browser/extensions/extension_message_handler.cc

Index: chrome/browser/extensions/extension_message_handler.cc
diff --git a/chrome/browser/extensions/extension_message_handler.cc b/chrome/browser/extensions/extension_message_handler.cc
index 131754932ec2798598a057fbf8e92439ce88d6b2..d55538ea3825ace8de62644a607c42711e8b97a9 100644
--- a/chrome/browser/extensions/extension_message_handler.cc
+++ b/chrome/browser/extensions/extension_message_handler.cc
@@ -5,6 +5,8 @@
 #include "chrome/browser/extensions/extension_message_handler.h"
 
 #include "chrome/browser/extensions/extension_message_service.h"
+#include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "content/public/browser/render_process_host.h"
@@ -38,8 +40,9 @@ void ExtensionMessageHandler::OnPostMessage(int port_id,
                                             const std::string& message) {
   Profile* profile = Profile::FromBrowserContext(
       render_view_host()->GetProcess()->GetBrowserContext());
-  if (profile->GetExtensionMessageService()) {
-    profile->GetExtensionMessageService()->PostMessageFromRenderer(
-        port_id, message);
+  ExtensionMessageService* message_service =
+      ExtensionSystemFactory::GetForProfile(profile)->message_service();
+  if (message_service) {
+    message_service->PostMessageFromRenderer(port_id, message);
   }
 }