Rename MessagePort to AwMessagePort

BUG=393291

Rename MessagePort to AwMessagePort to be consistent with other names in glue layer.

Review URL: https://codereview.chromium.org/1027503002

Cr-Commit-Position: refs/heads/master@{#321471}

android_webview/java/src/org/chromium/android_webview/AwContents.java

@@ -1996,7 +1996,7 @@ public class AwContents implements SmartClipProvider,
      *                  message ports to pass.
      */
     public void postMessageToFrame(String frameName, String message, String targetOrigin,
-            MessagePort[] sentPorts) {
+            AwMessagePort[] sentPorts) {
         if (isDestroyed()) return;
         if (mPostMessageSender == null) {
             AwMessagePortService service = mBrowserContext.getMessagePortService();
@@ -2030,10 +2030,10 @@ public class AwContents implements SmartClipProvider,
     /**
      * Creates a message channel and returns the ports for each end of the channel.
      */
-    public MessagePort[] createMessageChannel() {
+    public AwMessagePort[] createMessageChannel() {
         if (TRACE) Log.d(TAG, "createMessageChannel");
         if (isDestroyed()) return null;
-        MessagePort[] ports = mBrowserContext.getMessagePortService().createMessageChannel();
+        AwMessagePort[] ports = mBrowserContext.getMessagePortService().createMessageChannel();
         nativeCreateMessageChannel(mNativeAwContents, ports);
         return ports;
     }
@@ -2998,5 +2998,5 @@ public class AwContents implements SmartClipProvider,
     private native void nativePostMessageToFrame(long nativeAwContents, String frameId,
             String message, String targetOrigin, int[] msgPorts);
 
-    private native void nativeCreateMessageChannel(long nativeAwContents, MessagePort[] ports);
+    private native void nativeCreateMessageChannel(long nativeAwContents, AwMessagePort[] ports);
 }

android_webview/java/src/org/chromium/android_webview/MessagePort.java → android_webview/java/src/org/chromium/android_webview/AwMessagePort.java

@@ -69,14 +69,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 MessagePort implements PostMessageSender.PostMessageSenderDelegate {
+public class AwMessagePort 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, MessagePort[] sentPorts);
+        public abstract void onMessage(String message, AwMessagePort[] sentPorts);
     }
 
     private static final String TAG = "MessagePort";
@@ -86,11 +86,11 @@ public class MessagePort implements PostMessageSender.PostMessageSenderDelegate
     private static final int POST_MESSAGE = 1;
 
     private static class PostMessageFromWeb {
-        public MessagePort port;
+        public AwMessagePort port;
         public String message;
-        public MessagePort[] sentPorts;
+        public AwMessagePort[] sentPorts;
 
-        public PostMessageFromWeb(MessagePort port, String message, MessagePort[] sentPorts) {
+        public PostMessageFromWeb(AwMessagePort port, String message, AwMessagePort[] sentPorts) {
             this.port = port;
             this.message = message;
             this.sentPorts = sentPorts;
@@ -129,7 +129,7 @@ public class MessagePort implements PostMessageSender.PostMessageSenderDelegate
     private MessageHandler mHandler;
     private Object mLock = new Object();
 
-    public MessagePort(AwMessagePortService messagePortService) {
+    public AwMessagePort(AwMessagePortService messagePortService) {
         mMessagePortService = messagePortService;
         mPostMessageSender = new PostMessageSender(this, mMessagePortService);
         mMessagePortService.addObserver(mPostMessageSender);
@@ -194,7 +194,7 @@ public class MessagePort implements PostMessageSender.PostMessageSenderDelegate
     }
 
     // Only called on IO thread.
-    public void onReceivedMessage(String message, MessagePort[] sentPorts) {
+    public void onReceivedMessage(String message, AwMessagePort[] sentPorts) {
         synchronized (mLock) {
             PostMessageFromWeb m = new PostMessageFromWeb(this, message, sentPorts);
             Handler handler = mHandler != null ? mHandler : sDefaultHandler;
@@ -212,7 +212,7 @@ public class MessagePort implements PostMessageSender.PostMessageSenderDelegate
     }
 
     // This method may be called on a different thread than UI thread.
-    public void onMessage(String message, MessagePort[] ports) {
+    public void onMessage(String message, AwMessagePort[] ports) {
         synchronized (mLock) {
             if (isClosed()) {
                 Log.w(TAG, "Port [" + mPortId + "] received message in closed state");
@@ -227,12 +227,13 @@ public class MessagePort implements PostMessageSender.PostMessageSenderDelegate
         }
     }
 
-    public void postMessage(String message, MessagePort[] sentPorts) throws IllegalStateException {
+    public void postMessage(String message, AwMessagePort[] sentPorts)
+            throws IllegalStateException {
         if (isClosed() || isTransferred()) {
             throw new IllegalStateException("Port is already closed or transferred");
         }
         if (sentPorts != null) {
-            for (MessagePort port : sentPorts) {
+            for (AwMessagePort port : sentPorts) {
                 if (port.equals(this)) {
                     throw new IllegalStateException("Source port cannot be transferred");
                 }

android_webview/java/src/org/chromium/android_webview/AwMessagePortService.java

@@ -45,7 +45,7 @@ public class AwMessagePortService {
 
     // A thread safe storage for Message Ports.
     private static class MessagePortStorage {
-        private SparseArray<MessagePort> mMessagePorts = new SparseArray<MessagePort>();
+        private SparseArray<AwMessagePort> mMessagePorts = new SparseArray<AwMessagePort>();
         private Object mLock = new Object();
 
         public void remove(int portId) {
@@ -54,12 +54,12 @@ public class AwMessagePortService {
             }
         }
 
-        public void put(int portId, MessagePort m) {
+        public void put(int portId, AwMessagePort m) {
             synchronized (mLock) {
                 mMessagePorts.put(portId, m);
             }
         }
-        public MessagePort get(int portId) {
+        public AwMessagePort get(int portId) {
             synchronized (mLock) {
                 return mMessagePorts.get(portId);
             }
@@ -102,7 +102,7 @@ public class AwMessagePortService {
         // verify that webview owns all the ports that are transferred
         if (sentPorts != null) {
             for (int port : sentPorts) {
-                MessagePort p = mPortStorage.get(port);
+                AwMessagePort p = mPortStorage.get(port);
                 if (p == null) {
                     throw new IllegalStateException("Cannot transfer unknown port " + port);
                 }
@@ -111,8 +111,8 @@ public class AwMessagePortService {
         }
     }
 
-    public MessagePort[] createMessageChannel() {
-        return new MessagePort[]{new MessagePort(this), new MessagePort(this)};
+    public AwMessagePort[] createMessageChannel() {
+        return new AwMessagePort[]{new AwMessagePort(this), new AwMessagePort(this)};
     }
 
     // Called on UI thread.
@@ -121,7 +121,7 @@ public class AwMessagePortService {
         nativeReleaseMessages(mNativeMessagePortService, portId);
     }
 
-    private MessagePort addPort(MessagePort m, int portId) {
+    private AwMessagePort addPort(AwMessagePort m, int portId) {
         if (mPortStorage.get(portId) != null) {
             throw new IllegalStateException("Port already exists");
         }
@@ -132,7 +132,7 @@ public class AwMessagePortService {
 
     @CalledByNative
     private void onMessageChannelCreated(int portId1, int portId2,
-            MessagePort[] ports) {
+            AwMessagePort[] ports) {
         ThreadUtils.assertOnUiThread();
         addPort(ports[0], portId1);
         addPort(ports[1], portId2);
@@ -144,12 +144,12 @@ public class AwMessagePortService {
     // Called on IO thread.
     @CalledByNative
     private void onReceivedMessage(int portId, String message, int[] ports) {
-        MessagePort[] messagePorts = null;
+        AwMessagePort[] messagePorts = null;
         for (int i = 0; i < ports.length; i++) {
             if (messagePorts == null) {
-                messagePorts = new MessagePort[ports.length];
+                messagePorts = new AwMessagePort[ports.length];
             }
-            messagePorts[i] = addPort(new MessagePort(this), ports[i]);
+            messagePorts[i] = addPort(new AwMessagePort(this), ports[i]);
         }
         mPortStorage.get(portId).onReceivedMessage(message, messagePorts);
     }

android_webview/java/src/org/chromium/android_webview/PostMessageSender.java

@@ -39,10 +39,10 @@ public class PostMessageSender implements AwMessagePortService.MessageChannelObs
         public String frameName;
         public String message;
         public String targetOrigin;
-        public MessagePort[] sentPorts;
+        public AwMessagePort[] sentPorts;
 
         public PostMessageParams(String frameName, String message, String targetOrigin,
-                MessagePort[] sentPorts) {
+                AwMessagePort[] sentPorts) {
             this.frameName = frameName;
             this.message = message;
             this.targetOrigin = targetOrigin;
@@ -71,9 +71,9 @@ public class PostMessageSender implements AwMessagePortService.MessageChannelObs
     }
 
     // Return true if any sent port is pending.
-    private boolean anySentPortIsPending(MessagePort[] sentPorts) {
+    private boolean anySentPortIsPending(AwMessagePort[] sentPorts) {
         if (sentPorts != null) {
-            for (MessagePort port : sentPorts) {
+            for (AwMessagePort port : sentPorts) {
                 if (!port.isReady()) {
                     return true;
                 }
@@ -88,7 +88,7 @@ public class PostMessageSender implements AwMessagePortService.MessageChannelObs
     // a pending state.
     // 2. There are already queued messages
     // 3. The message includes a port that is not ready yet.
-    private boolean shouldQueueMessage(MessagePort[] sentPorts) {
+    private boolean shouldQueueMessage(AwMessagePort[] sentPorts) {
         // if messages to frames are already in queue mode, simply queue it, no need to
         // check ports.
         if (mMessageQueue.size() > 0 || !mDelegate.isPostMessageSenderReady()) {
@@ -101,7 +101,7 @@ public class PostMessageSender implements AwMessagePortService.MessageChannelObs
     }
 
     private void postMessageToWeb(String frameName, String message, String targetOrigin,
-            MessagePort[] sentPorts) {
+            AwMessagePort[] sentPorts) {
         int[] portIds = null;
         if (sentPorts != null) {
             portIds = new int[sentPorts.length];
@@ -118,10 +118,10 @@ public class PostMessageSender implements AwMessagePortService.MessageChannelObs
      * when message can be sent.
      */
     public void postMessage(String frameName, String message, String targetOrigin,
-            MessagePort[] sentPorts) throws IllegalStateException {
+            AwMessagePort[] sentPorts) throws IllegalStateException {
         // Sanity check all the ports that are being transferred.
         if (sentPorts != null) {
-            for (MessagePort p : sentPorts) {
+            for (AwMessagePort p : sentPorts) {
                 if (p.isClosed()) {
                     throw new IllegalStateException("Closed port cannot be transfered");
                 }