Move MessagePort implementation from android_webview to content

content/browser/android/app_web_message_port_message_filter.cc

Index: content/browser/android/app_web_message_port_message_filter.cc
diff --git a/android_webview/browser/aw_message_port_message_filter.cc b/content/browser/android/app_web_message_port_message_filter.cc
similarity index 32%
rename from android_webview/browser/aw_message_port_message_filter.cc
rename to content/browser/android/app_web_message_port_message_filter.cc
index e577dd48eea937a2529a31937ce5f9070b755416..b95ea00ffd54806ecd0a64d54bc017e35b4e2c6d 100644
--- a/android_webview/browser/aw_message_port_message_filter.cc
+++ b/content/browser/android/app_web_message_port_message_filter.cc
@@ -2,95 +2,96 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "android_webview/browser/aw_message_port_message_filter.h"
+#include "content/browser/android/app_web_message_port_message_filter.h"
 
-#include "android_webview/browser/aw_browser_context.h"
-#include "android_webview/common/aw_message_port_messages.h"
+#include "content/browser/android/app_web_message_port_service_impl.h"
+#include "content/browser/message_port_service.h"
+#include "content/common/app_web_message_port_messages.h"
+#include "content/public/browser/android/app_web_message_port_service.h"
 #include "content/public/browser/message_port_provider.h"
 
 using content::BrowserThread;
 using content::MessagePortProvider;
 
-namespace android_webview {
+namespace content {
 
-AwMessagePortMessageFilter::AwMessagePortMessageFilter(int route_id)
-    : BrowserMessageFilter(AwMessagePortMsgStart), route_id_(route_id) {
-}
+AppWebMessagePortMessageFilter::AppWebMessagePortMessageFilter(int route_id)
+    : BrowserMessageFilter(AwMessagePortMsgStart), route_id_(route_id) {}
 
-AwMessagePortMessageFilter::~AwMessagePortMessageFilter() {
-}
+AppWebMessagePortMessageFilter::~AppWebMessagePortMessageFilter() {}
 
-void AwMessagePortMessageFilter::OnChannelClosing() {
-  MessagePortProvider::OnMessagePortDelegateClosing(this);
-  AwBrowserContext::GetDefault()->GetMessagePortService()->
-      OnMessagePortMessageFilterClosing(this);
+void AppWebMessagePortMessageFilter::OnChannelClosing() {
+  MessagePortService::GetInstance()->OnMessagePortDelegateClosing(this);
+  AppWebMessagePortServiceImpl::GetInstance()
+      ->OnMessagePortMessageFilterClosing(this);
 }
 
-bool AwMessagePortMessageFilter::OnMessageReceived(
+bool AppWebMessagePortMessageFilter::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(AwMessagePortMessageFilter, message)
-    IPC_MESSAGE_FORWARD(AwMessagePortHostMsg_ConvertedWebToAppMessage,
-                        AwBrowserContext::GetDefault()->GetMessagePortService(),
-                        AwMessagePortService::OnConvertedWebToAppMessage)
-    IPC_MESSAGE_HANDLER(AwMessagePortHostMsg_ConvertedAppToWebMessage,
+  IPC_BEGIN_MESSAGE_MAP(AppWebMessagePortMessageFilter, message)
+    IPC_MESSAGE_FORWARD(
+        AppWebMessagePortHostMsg_ConvertedWebToAppMessage,
+        AppWebMessagePortServiceImpl::GetInstance(),
+        AppWebMessagePortServiceImpl::OnConvertedWebToAppMessage)
+    IPC_MESSAGE_HANDLER(AppWebMessagePortHostMsg_ConvertedAppToWebMessage,
                         OnConvertedAppToWebMessage)
-    IPC_MESSAGE_HANDLER(AwMessagePortHostMsg_ClosePortAck, OnClosePortAck)
+    IPC_MESSAGE_HANDLER(AppWebMessagePortHostMsg_ClosePortAck, OnClosePortAck)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
-void AwMessagePortMessageFilter::OnConvertedAppToWebMessage(
+void AppWebMessagePortMessageFilter::OnConvertedAppToWebMessage(
     int msg_port_id,
     const base::string16& message,
     const std::vector<int>& sent_message_port_ids) {
-  MessagePortProvider::PostMessageToPort(msg_port_id,
-      message,
-      sent_message_port_ids);
+  MessagePortService* msp = MessagePortService::GetInstance();
+  msp->PostMessage(msg_port_id, message, sent_message_port_ids);
 }
 
-void AwMessagePortMessageFilter::OnClosePortAck(int message_port_id) {
-  MessagePortProvider::ClosePort(message_port_id);
-  AwBrowserContext::GetDefault()->GetMessagePortService()->
-      CleanupPort(message_port_id);
+void AppWebMessagePortMessageFilter::OnClosePortAck(int message_port_id) {
+  MessagePortService* msp = MessagePortService::GetInstance();
+  msp->ClosePort(message_port_id);
+  AppWebMessagePortServiceImpl::GetInstance()->CleanupPort(message_port_id);
 }
 
-void AwMessagePortMessageFilter::OnDestruct() const {
+void AppWebMessagePortMessageFilter::OnDestruct() const {
   BrowserThread::DeleteOnIOThread::Destruct(this);
 }
 
-void AwMessagePortMessageFilter::SendAppToWebMessage(
+void AppWebMessagePortMessageFilter::SendAppToWebMessage(
     int msg_port_route_id,
     const base::string16& message,
     const std::vector<int>& sent_message_port_ids) {
-  Send(new AwMessagePortMsg_AppToWebMessage(
+  Send(new AppWebMessagePortMsg_AppToWebMessage(
       route_id_,
-      msg_port_route_id, // same as the port id
+      msg_port_route_id,  // same as the port id
       message, sent_message_port_ids));
 }
 
-void AwMessagePortMessageFilter::SendClosePortMessage(int message_port_id) {
-  Send(new AwMessagePortMsg_ClosePort(route_id_, message_port_id));
+void AppWebMessagePortMessageFilter::SendClosePortMessage(int message_port_id) {
+  Send(new AppWebMessagePortMsg_ClosePort(route_id_, message_port_id));
 }
 
-void AwMessagePortMessageFilter::SendMessage(
+void AppWebMessagePortMessageFilter::SendMessage(
     int msg_port_route_id,
     const base::string16& message,
     const std::vector<int>& sent_message_port_ids) {
+  MessagePortService* msp = MessagePortService::GetInstance();
   for (int sent_port_id : sent_message_port_ids) {
-    MessagePortProvider::HoldMessages(sent_port_id);
-    MessagePortProvider::UpdateMessagePort(sent_port_id, this);
+    msp->HoldMessages(sent_port_id);
+    msp->UpdateMessagePort(sent_port_id, this, sent_port_id);
   }
-  Send(new AwMessagePortMsg_WebToAppMessage(
+  Send(new AppWebMessagePortMsg_WebToAppMessage(
       route_id_,
-      msg_port_route_id, // same as the port id
+      msg_port_route_id,  // same as the port id
       message, sent_message_port_ids));
 }
 
-void AwMessagePortMessageFilter::SendMessagesAreQueued(int route_id) {
+void AppWebMessagePortMessageFilter::SendMessagesAreQueued(int route_id) {
   // TODO(sgurun) implement
   NOTREACHED();
 }
 
-}   // namespace android_webview
+}  // namespace content