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

chrome/browser/renderer_host/chrome_render_message_filter.cc

Index: chrome/browser/renderer_host/chrome_render_message_filter.cc
diff --git a/chrome/browser/renderer_host/chrome_render_message_filter.cc b/chrome/browser/renderer_host/chrome_render_message_filter.cc
index 75d290db8216a98bd495e46fbdca3dc72ad10c51..57050b9b0e38d55c79721a4abba6ccfa6096f1fc 100644
--- a/chrome/browser/renderer_host/chrome_render_message_filter.cc
+++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc
@@ -17,6 +17,8 @@
 #include "chrome/browser/extensions/extension_info_map.h"
 #include "chrome/browser/extensions/extension_message_service.h"
 #include "chrome/browser/extensions/extension_process_manager.h"
+#include "chrome/browser/extensions/extension_system.h"
+#include "chrome/browser/extensions/extension_system_factory.h"
 #include "chrome/browser/metrics/histogram_synchronizer.h"
 #include "chrome/browser/nacl_host/nacl_process_host.h"
 #include "chrome/browser/net/chrome_url_request_context.h"
@@ -53,7 +55,8 @@ ChromeRenderMessageFilter::ChromeRenderMessageFilter(
     : render_process_id_(render_process_id),
       profile_(profile),
       request_context_(request_context),
-      extension_info_map_(profile->GetExtensionInfoMap()),
+      extension_info_map_(
+          ExtensionSystemFactory::GetForProfile(profile)->info_map()),
       cookie_settings_(CookieSettings::Factory::GetForProfile(profile)),
       weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
@@ -263,9 +266,10 @@ void ChromeRenderMessageFilter::OpenChannelToExtensionOnUIThread(
     const std::string& target_extension_id,
     const std::string& channel_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  profile_->GetExtensionMessageService()->OpenChannelToExtension(
-      source_process_id, source_routing_id, receiver_port_id,
-      source_extension_id, target_extension_id, channel_name);
+  ExtensionSystemFactory::GetForProfile(profile_)->message_service()->
+      OpenChannelToExtension(
+          source_process_id, source_routing_id, receiver_port_id,
+          source_extension_id, target_extension_id, channel_name);
 }
 
 void ChromeRenderMessageFilter::OnOpenChannelToTab(
@@ -288,9 +292,10 @@ void ChromeRenderMessageFilter::OpenChannelToTabOnUIThread(
     const std::string& extension_id,
     const std::string& channel_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  profile_->GetExtensionMessageService()->OpenChannelToTab(
-      source_process_id, source_routing_id, receiver_port_id,
-      tab_id, extension_id, channel_name);
+  ExtensionSystemFactory::GetForProfile(profile_)->message_service()->
+      OpenChannelToTab(
+          source_process_id, source_routing_id, receiver_port_id,
+          tab_id, extension_id, channel_name);
 }
 
 void ChromeRenderMessageFilter::OnGetExtensionMessageBundle(
@@ -378,8 +383,10 @@ void ChromeRenderMessageFilter::OnExtensionCloseChannel(int port_id) {
   if (!content::RenderProcessHost::FromID(render_process_id_))
     return;  // To guard against crash in browser_tests shutdown.
 
-  if (profile_->GetExtensionMessageService())
-    profile_->GetExtensionMessageService()->CloseChannel(port_id);
+  ExtensionMessageService* message_service =
+      ExtensionSystemFactory::GetForProfile(profile_)->message_service();
+  if (message_service)
+    message_service->CloseChannel(port_id);
 }
 
 void ChromeRenderMessageFilter::OnExtensionRequestForIOThread(