Move MessagePort implementation from android_webview to content

content/renderer/android/app_web_message_port_client.cc

Index: content/renderer/android/app_web_message_port_client.cc
diff --git a/android_webview/renderer/aw_message_port_client.cc b/content/renderer/android/app_web_message_port_client.cc
similarity index 74%
rename from android_webview/renderer/aw_message_port_client.cc
rename to content/renderer/android/app_web_message_port_client.cc
index 6871f2911e02aab834cb86659762bbf3a1246e04..8cad8df365983a8e3827ccab0da94038e517bdaa 100644
--- a/android_webview/renderer/aw_message_port_client.cc
+++ b/content/renderer/android/app_web_message_port_client.cc
@@ -2,12 +2,11 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "android_webview/renderer/aw_message_port_client.h"
-
+#include <content/common/app_web_message_port_messages.h>
+#include <content/renderer/android/app_web_message_port_client.h>
 #include <memory>
 #include <utility>
 
-#include "android_webview/common/aw_message_port_messages.h"
 #include "content/public/child/v8_value_converter.h"
 #include "content/public/renderer/render_frame.h"
 #include "content/public/renderer/render_view.h"
@@ -22,33 +21,34 @@ using blink::WebSerializedScriptValue;
 using content::V8ValueConverter;
 using std::vector;
 
-namespace android_webview {
+namespace content {
 
-AwMessagePortClient::AwMessagePortClient(content::RenderFrame* render_frame)
+AppWebMessagePortClient::AppWebMessagePortClient(
+    content::RenderFrame* render_frame)
     : content::RenderFrameObserver(render_frame) {
 }
 
-AwMessagePortClient::~AwMessagePortClient() {
+AppWebMessagePortClient::~AppWebMessagePortClient() {
 }
 
-bool AwMessagePortClient::OnMessageReceived(
+bool AppWebMessagePortClient::OnMessageReceived(
     const IPC::Message& message) {
   bool handled = true;
-  IPC_BEGIN_MESSAGE_MAP(AwMessagePortClient, message)
-    IPC_MESSAGE_HANDLER(AwMessagePortMsg_WebToAppMessage, OnWebToAppMessage)
-    IPC_MESSAGE_HANDLER(AwMessagePortMsg_AppToWebMessage, OnAppToWebMessage)
-    IPC_MESSAGE_HANDLER(AwMessagePortMsg_ClosePort, OnClosePort)
+  IPC_BEGIN_MESSAGE_MAP(AppWebMessagePortClient, message)
+    IPC_MESSAGE_HANDLER(AppWebMessagePortMsg_WebToAppMessage, OnWebToAppMessage)
+    IPC_MESSAGE_HANDLER(AppWebMessagePortMsg_AppToWebMessage, OnAppToWebMessage)
+    IPC_MESSAGE_HANDLER(AppWebMessagePortMsg_ClosePort, OnClosePort)
     IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
 
   return handled;
 }
 
-void AwMessagePortClient::OnDestruct() {
+void AppWebMessagePortClient::OnDestruct() {
   delete this;
 }
 
-void AwMessagePortClient::OnWebToAppMessage(
+void AppWebMessagePortClient::OnWebToAppMessage(
     int message_port_id,
     const base::string16& message,
     const vector<int>& sent_message_port_ids) {
@@ -74,12 +74,12 @@ void AwMessagePortClient::OnWebToAppMessage(
     result.Append(std::move(value));
   }
 
-  Send(new AwMessagePortHostMsg_ConvertedWebToAppMessage(
+  Send(new AppWebMessagePortHostMsg_ConvertedWebToAppMessage(
       render_frame()->GetRoutingID(), message_port_id, result,
       sent_message_port_ids));
 }
 
-void AwMessagePortClient::OnAppToWebMessage(
+void AppWebMessagePortClient::OnAppToWebMessage(
     int message_port_id,
     const base::string16& message,
     const vector<int>& sent_message_port_ids) {
@@ -102,13 +102,13 @@ void AwMessagePortClient::OnAppToWebMessage(
   WebSerializedScriptValue serialized_script_value =
       WebSerializedScriptValue::serialize(result_value);
   base::string16 result = serialized_script_value.toString();
-  Send(new AwMessagePortHostMsg_ConvertedAppToWebMessage(
+  Send(new AppWebMessagePortHostMsg_ConvertedAppToWebMessage(
       render_frame()->GetRoutingID(), message_port_id,
       result, sent_message_port_ids));
 }
 
-void AwMessagePortClient::OnClosePort(int message_port_id) {
-  Send(new AwMessagePortHostMsg_ClosePortAck(render_frame()->GetRoutingID(),
+void AppWebMessagePortClient::OnClosePort(int message_port_id) {
+  Send(new AppWebMessagePortHostMsg_ClosePortAck(render_frame()->GetRoutingID(),
                                              message_port_id));
 }