Change MessageService to use ProfileKeyedAPI.

chrome/browser/extensions/extension_system.cc

Index: chrome/browser/extensions/extension_system.cc
diff --git a/chrome/browser/extensions/extension_system.cc b/chrome/browser/extensions/extension_system.cc
index 2127e00c63beabb69c888da17c575b6761df49f6..16de4be94cf50b78d47b34a9331db7b1a9e821d7 100644
--- a/chrome/browser/extensions/extension_system.cc
+++ b/chrome/browser/extensions/extension_system.cc
@@ -15,7 +15,6 @@
 #include "chrome/browser/extensions/api/alarms/alarm_manager.h"
 #include "chrome/browser/extensions/api/declarative/rules_registry_service.h"
 #include "chrome/browser/extensions/api/location/location_manager.h"
-#include "chrome/browser/extensions/api/messaging/message_service.h"
 #include "chrome/browser/extensions/blacklist.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/event_router.h"
@@ -130,7 +129,6 @@ void ExtensionSystemImpl::Shared::RegisterManagementPolicyProviders() {
 void ExtensionSystemImpl::Shared::Init(bool extensions_enabled) {
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
 
-  message_service_.reset(new MessageService(lazy_background_task_queue_.get()));
   navigation_observer_.reset(new NavigationObserver(profile_));
 
   bool allow_noisy_errors = !command_line->HasSwitch(switches::kNoErrorDialogs);
@@ -289,10 +287,6 @@ LazyBackgroundTaskQueue*
   return lazy_background_task_queue_.get();
 }
 
-MessageService* ExtensionSystemImpl::Shared::message_service() {
-  return message_service_.get();
-}
-
 EventRouter* ExtensionSystemImpl::Shared::event_router() {
   return event_router_.get();
 }
@@ -417,10 +411,6 @@ LazyBackgroundTaskQueue* ExtensionSystemImpl::lazy_background_task_queue() {
   return shared_->lazy_background_task_queue();
 }
 
-MessageService* ExtensionSystemImpl::message_service() {
-  return shared_->message_service();
-}
-
 EventRouter* ExtensionSystemImpl::event_router() {
   return shared_->event_router();
 }