Move MessagePort implementation from android_webview to content

content/renderer/android/app_web_message_port_client.h

Index: content/renderer/android/app_web_message_port_client.h
diff --git a/android_webview/renderer/aw_message_port_client.h b/content/renderer/android/app_web_message_port_client.h
similarity index 69%
rename from android_webview/renderer/aw_message_port_client.h
rename to content/renderer/android/app_web_message_port_client.h
index c18f41203b0f35924eda848f256f89de93500a81..e2c3f8d196bd6a91ba209be531394c4c617366df 100644
--- a/android_webview/renderer/aw_message_port_client.h
+++ b/content/renderer/android/app_web_message_port_client.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef ANDROID_WEBVIEW_RENDERER_AW_MESSAGE_PORT_CLIENT_H_
-#define ANDROID_WEBVIEW_RENDERER_AW_MESSAGE_PORT_CLIENT_H_
+#ifndef CONTENT_RENDERER_ANDROID_APP_WEB_MESSAGE_PORT_CLIENT_H_
+#define CONTENT_RENDERER_ANDROID_APP_WEB_MESSAGE_PORT_CLIENT_H_
 
 #include <vector>
 
@@ -11,16 +11,16 @@
 #include "base/strings/string16.h"
 #include "content/public/renderer/render_frame_observer.h"
 
-namespace android_webview {
+namespace content {
 
 // Renderer side of Android webview specific message port service. This service
 // is used to convert messages from WebSerializedScriptValue to a base value.
-class AwMessagePortClient : public content::RenderFrameObserver {
+class AppWebMessagePortClient : public content::RenderFrameObserver {
  public:
-  explicit AwMessagePortClient(content::RenderFrame* render_frame);
+  explicit AppWebMessagePortClient(content::RenderFrame* render_frame);
 
  private:
-  ~AwMessagePortClient() override;
+  ~AppWebMessagePortClient() override;
 
   // RenderFrameObserver
   bool OnMessageReceived(const IPC::Message& message) override;
@@ -34,9 +34,8 @@ class AwMessagePortClient : public content::RenderFrameObserver {
                          const std::vector<int>& sent_message_port_ids);
   void OnClosePort(int message_port_id);
 
-  DISALLOW_COPY_AND_ASSIGN(AwMessagePortClient);
+  DISALLOW_COPY_AND_ASSIGN(AppWebMessagePortClient);
 };
-
 }
 
-#endif  // ANDROID_WEBVIEW_RENDERER_AW_MESSAGE_PORT_CLIENT_H_
+#endif  // CONTENT_RENDERER_ANDROID_APP_WEB_MESSAGE_PORT_CLIENT_H_