Move MessagePort implementation from android_webview to content

content/public/android/java/src/org/chromium/content/browser/AppWebMessagePort.java

Index: content/public/android/java/src/org/chromium/content/browser/AppWebMessagePort.java
diff --git a/android_webview/java/src/org/chromium/android_webview/AwMessagePort.java b/content/public/android/java/src/org/chromium/content/browser/AppWebMessagePort.java
similarity index 91%
rename from android_webview/java/src/org/chromium/android_webview/AwMessagePort.java
rename to content/public/android/java/src/org/chromium/content/browser/AppWebMessagePort.java
index 97e4d4951c2c0a7ff41abf09e657fc7a216a71c1..8eb6a7032f8f0b9750726a37a8c999a843eddecb 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwMessagePort.java
+++ b/content/public/android/java/src/org/chromium/content/browser/AppWebMessagePort.java
@@ -2,12 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-package org.chromium.android_webview;
+package org.chromium.content.browser;
 
 import android.os.Handler;
 import android.os.Looper;
 import android.os.Message;
-import android.util.Log;
+
+import org.chromium.base.Log;
 
 /**
  * Represents the MessageChannel MessagePort object. Inspired from
@@ -69,14 +70,14 @@ import android.util.Log;
  * transferring data. As a return, it simplifies implementation and prevents hard
  * to debug, racy corner cases while receiving/sending data.
  */
-public class AwMessagePort implements PostMessageSender.PostMessageSenderDelegate {
+public class AppWebMessagePort implements PostMessageSender.PostMessageSenderDelegate {
 
     /**
      * The message callback for receiving messages. Called on UI thread or if
      * provided, on the handler that is provided.
      */
     public abstract static class MessageCallback {
-        public abstract void onMessage(String message, AwMessagePort[] sentPorts);
+        public abstract void onMessage(String message, AppWebMessagePort[] sentPorts);
     }
 
     private static final String TAG = "MessagePort";
@@ -86,11 +87,12 @@ public class AwMessagePort implements PostMessageSender.PostMessageSenderDelegat
     private static final int POST_MESSAGE = 1;
 
     private static class PostMessageFromWeb {
-        public AwMessagePort port;
+        public AppWebMessagePort port;
         public String message;
-        public AwMessagePort[] sentPorts;
+        public AppWebMessagePort[] sentPorts;
 
-        public PostMessageFromWeb(AwMessagePort port, String message, AwMessagePort[] sentPorts) {
+        public PostMessageFromWeb(
+                AppWebMessagePort port, String message, AppWebMessagePort[] sentPorts) {
             this.port = port;
             this.message = message;
             this.sentPorts = sentPorts;
@@ -120,7 +122,7 @@ public class AwMessagePort implements PostMessageSender.PostMessageSenderDelegat
 
     private int mPortId = PENDING;
     private MessageCallback mMessageCallback;
-    private AwMessagePortService mMessagePortService;
+    private AppWebMessagePortService mMessagePortService;
     private boolean mClosed;
     private boolean mTransferred;
     private boolean mStarted;
@@ -129,7 +131,7 @@ public class AwMessagePort implements PostMessageSender.PostMessageSenderDelegat
     private MessageHandler mHandler;
     private final Object mLock = new Object();
 
-    public AwMessagePort(AwMessagePortService messagePortService) {
+    public AppWebMessagePort(AppWebMessagePortService messagePortService) {
         mMessagePortService = messagePortService;
         mPostMessageSender = new PostMessageSender(this, mMessagePortService);
         mMessagePortService.addObserver(mPostMessageSender);
@@ -194,7 +196,7 @@ public class AwMessagePort implements PostMessageSender.PostMessageSenderDelegat
     }
 
     // Only called on IO thread.
-    public void onReceivedMessage(String message, AwMessagePort[] sentPorts) {
+    public void onReceivedMessage(String message, AppWebMessagePort[] sentPorts) {
         synchronized (mLock) {
             PostMessageFromWeb m = new PostMessageFromWeb(this, message, sentPorts);
             Handler handler = mHandler != null ? mHandler : sDefaultHandler;
@@ -212,7 +214,7 @@ public class AwMessagePort implements PostMessageSender.PostMessageSenderDelegat
     }
 
     // This method may be called on a different thread than UI thread.
-    public void onMessage(String message, AwMessagePort[] ports) {
+    public void onMessage(String message, AppWebMessagePort[] ports) {
         synchronized (mLock) {
             if (isClosed()) {
                 Log.w(TAG, "Port [" + mPortId + "] received message in closed state");
@@ -227,13 +229,13 @@ public class AwMessagePort implements PostMessageSender.PostMessageSenderDelegat
         }
     }
 
-    public void postMessage(String message, AwMessagePort[] sentPorts)
+    public void postMessage(String message, AppWebMessagePort[] sentPorts)
             throws IllegalStateException {
         if (isClosed() || isTransferred()) {
             throw new IllegalStateException("Port is already closed or transferred");
         }
         if (sentPorts != null) {
-            for (AwMessagePort port : sentPorts) {
+            for (AppWebMessagePort port : sentPorts) {
                 if (port.equals(this)) {
                     throw new IllegalStateException("Source port cannot be transferred");
                 }