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

chrome/browser/renderer_host/chrome_render_message_filter.cc

Index: chrome/browser/renderer_host/chrome_render_message_filter.cc
===================================================================
--- chrome/browser/renderer_host/chrome_render_message_filter.cc	(revision 124830)
+++ chrome/browser/renderer_host/chrome_render_message_filter.cc	(working copy)
@@ -17,8 +17,6 @@
 #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"
@@ -56,8 +54,7 @@
     : render_process_id_(render_process_id),
       profile_(profile),
       request_context_(request_context),
-      extension_info_map_(
-          ExtensionSystemFactory::GetForProfile(profile)->info_map()),
+      extension_info_map_(profile->GetExtensionInfoMap()),
       cookie_settings_(CookieSettings::Factory::GetForProfile(profile)),
       weak_ptr_factory_(ALLOW_THIS_IN_INITIALIZER_LIST(this)) {
 }
@@ -270,10 +267,9 @@
     const std::string& target_extension_id,
     const std::string& channel_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  ExtensionSystemFactory::GetForProfile(profile_)->message_service()->
-      OpenChannelToExtension(
-          source_process_id, source_routing_id, receiver_port_id,
-          source_extension_id, target_extension_id, channel_name);
+  profile_->GetExtensionMessageService()->OpenChannelToExtension(
+      source_process_id, source_routing_id, receiver_port_id,
+      source_extension_id, target_extension_id, channel_name);
 }
 
 void ChromeRenderMessageFilter::OnOpenChannelToTab(
@@ -296,8 +292,7 @@
     const std::string& extension_id,
     const std::string& channel_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  ExtensionSystemFactory::GetForProfile(profile_)->message_service()->
-      OpenChannelToTab(
+  profile_->GetExtensionMessageService()->OpenChannelToTab(
       source_process_id, source_routing_id, receiver_port_id,
       tab_id, extension_id, channel_name);
 }
@@ -386,10 +381,8 @@
   if (!content::RenderProcessHost::FromID(render_process_id_))
     return;  // To guard against crash in browser_tests shutdown.
 
-  ExtensionMessageService* message_service =
-      ExtensionSystemFactory::GetForProfile(profile_)->message_service();
-  if (message_service)
-    message_service->CloseChannel(port_id);
+  if (profile_->GetExtensionMessageService())
+    profile_->GetExtensionMessageService()->CloseChannel(port_id);
 }
 
 void ChromeRenderMessageFilter::OnExtensionRequestForIOThread(