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 0c59aac9e5b560c57358a8ec6f453c9d377dd50d..8f6b3b6d89b7734b8f42521309b0bf5ceec445e3 100644
--- a/chrome/browser/renderer_host/chrome_render_message_filter.cc
+++ b/chrome/browser/renderer_host/chrome_render_message_filter.cc
@@ -393,8 +393,8 @@ void ChromeRenderMessageFilter::OpenChannelToExtensionOnUIThread(
     const ExtensionMsg_ExternalConnectionInfo& info,
     const std::string& channel_name) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  extensions::ExtensionSystem::Get(profile_)->message_service()->
-      OpenChannelToExtension(
+  extensions::ProfileKeyedAPIFactory<extensions::MessageService>::
+      GetForProfile(profile_)->OpenChannelToExtension(
           source_process_id, source_routing_id, receiver_port_id,
           info.source_id, info.target_id, info.source_url, channel_name);
 }
@@ -420,8 +420,8 @@ 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(
+  extensions::ProfileKeyedAPIFactory<extensions::MessageService>::
+      GetForProfile(profile_)->OpenChannelToNativeApp(
           render_process_id_, source_routing_id, receiver_port_id,
           source_extension_id, native_app_name);
 }
@@ -446,8 +446,8 @@ 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(
+  extensions::ProfileKeyedAPIFactory<extensions::MessageService>::
+      GetForProfile(profile_)->OpenChannelToTab(
           source_process_id, source_routing_id, receiver_port_id,
           tab_id, extension_id, channel_name);
 }
@@ -568,7 +568,8 @@ void ChromeRenderMessageFilter::OnExtensionCloseChannel(
     return;  // To guard against crash in browser_tests shutdown.
 
   extensions::MessageService* message_service =
-      extensions::ExtensionSystem::Get(profile_)->message_service();
+      extensions::ProfileKeyedAPIFactory<extensions::MessageService>::
+          GetForProfile(profile_);
   if (message_service)
     message_service->CloseChannel(port_id, error_message);
 }