Change MessageService to use ProfileKeyedAPI.

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 50844e2db77e669046cbdcf8fbf1bf002ca6230f..285f1a549aaedda853da825b6947ae7520a8cc93 100644
--- a/chrome/browser/renderer_host/chrome_render_message_filter.cc
+++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc
@@ -394,10 +394,9 @@ void ChromeRenderMessageFilter::OpenChannelToExtensionOnUIThread(
     const ExtensionMsg_ExternalConnectionInfo& info,
     const std::string& channel_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  extensions::ExtensionSystem::Get(profile_)->message_service()->
-      OpenChannelToExtension(
-          source_process_id, source_routing_id, receiver_port_id,
-          info.source_id, info.target_id, info.source_url, channel_name);
+  extensions::MessageService::Get(profile_)->OpenChannelToExtension(
+      source_process_id, source_routing_id, receiver_port_id,
+      info.source_id, info.target_id, info.source_url, channel_name);
 }
 
 void ChromeRenderMessageFilter::OnOpenChannelToNativeApp(
@@ -421,10 +420,9 @@ void ChromeRenderMessageFilter::OpenChannelToNativeAppOnUIThread(
     const std::string& source_extension_id,
     const std::string& native_app_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  extensions::ExtensionSystem::Get(profile_)->message_service()->
-      OpenChannelToNativeApp(
-          render_process_id_, source_routing_id, receiver_port_id,
-          source_extension_id, native_app_name);
+  extensions::MessageService::Get(profile_)->OpenChannelToNativeApp(
+      render_process_id_, source_routing_id, receiver_port_id,
+      source_extension_id, native_app_name);
 }
 
 void ChromeRenderMessageFilter::OnOpenChannelToTab(
@@ -447,10 +445,9 @@ void ChromeRenderMessageFilter::OpenChannelToTabOnUIThread(
     const std::string& extension_id,
     const std::string& channel_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  extensions::ExtensionSystem::Get(profile_)->message_service()->
-      OpenChannelToTab(
-          source_process_id, source_routing_id, receiver_port_id,
-          tab_id, extension_id, channel_name);
+  extensions::MessageService::Get(profile_)->OpenChannelToTab(
+      source_process_id, source_routing_id, receiver_port_id,
+      tab_id, extension_id, channel_name);
 }
 
 void ChromeRenderMessageFilter::OnGetExtensionMessageBundle(
@@ -569,7 +566,7 @@ void ChromeRenderMessageFilter::OnExtensionCloseChannel(
     return;  // To guard against crash in browser_tests shutdown.
 
   extensions::MessageService* message_service =
-      extensions::ExtensionSystem::Get(profile_)->message_service();
+      extensions::MessageService::Get(profile_);
   if (message_service)
     message_service->CloseChannel(port_id, error_message);
 }