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

chrome/browser/extensions/extension_message_handler.cc

Index: chrome/browser/extensions/extension_message_handler.cc
===================================================================
--- chrome/browser/extensions/extension_message_handler.cc	(revision 124830)
+++ chrome/browser/extensions/extension_message_handler.cc	(working copy)
@@ -5,8 +5,6 @@
 #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/browser/renderer_host/render_view_host.h"
@@ -40,9 +38,8 @@
                                             const std::string& message) {
   Profile* profile = Profile::FromBrowserContext(
       render_view_host()->process()->GetBrowserContext());
-  ExtensionMessageService* message_service =
-      ExtensionSystemFactory::GetForProfile(profile)->message_service();
-  if (message_service) {
-    message_service->PostMessageFromRenderer(port_id, message);
+  if (profile->GetExtensionMessageService()) {
+    profile->GetExtensionMessageService()->PostMessageFromRenderer(
+        port_id, message);
   }
 }