Rename WebEventHandler to MessageCallback

Rename WebEventHandler to MessageCallback to be more compatible with
other postmessage names.

BUG=393291

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

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

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

@@ -72,9 +72,10 @@ import android.util.Log;
 public class MessagePort implements PostMessageSender.PostMessageSenderDelegate {
 
     /**
-     * The message event handler for receiving messages. Called on a background thread.
+     * The message callback for receiving messages. Called on UI thread or if
+     * provided, on the handler that is provided.
      */
-    public abstract static class WebEventHandler {
+    public abstract static class MessageCallback {
         public abstract void onMessage(String message, MessagePort[] sentPorts);
     }
 
@@ -118,7 +119,7 @@ public class MessagePort implements PostMessageSender.PostMessageSenderDelegate
             new MessageHandler(Looper.getMainLooper());
 
     private int mPortId = PENDING;
-    private WebEventHandler mWebEventHandler;
+    private MessageCallback mMessageCallback;
     private AwMessagePortService mMessagePortService;
     private boolean mClosed;
     private boolean mTransferred;
@@ -181,10 +182,10 @@ public class MessagePort implements PostMessageSender.PostMessageSenderDelegate
     }
 
     // Only called on UI thread
-    public void setWebEventHandler(WebEventHandler webEventHandler, Handler handler) {
+    public void setMessageCallback(MessageCallback messageCallback, Handler handler) {
         mStarted = true;
         synchronized (mLock) {
-            mWebEventHandler = webEventHandler;
+            mMessageCallback = messageCallback;
             if (handler != null) {
                 mHandler = new MessageHandler(handler.getLooper());
             }
@@ -203,7 +204,7 @@ public class MessagePort implements PostMessageSender.PostMessageSenderDelegate
     }
 
     private void releaseMessages() {
-        if (mReleasedMessages || !isReady() || mWebEventHandler == null) {
+        if (mReleasedMessages || !isReady() || mMessageCallback == null) {
             return;
         }
         mReleasedMessages = true;
@@ -217,12 +218,12 @@ public class MessagePort implements PostMessageSender.PostMessageSenderDelegate
                 Log.w(TAG, "Port [" + mPortId + "] received message in closed state");
                 return;
             }
-            if (mWebEventHandler == null) {
+            if (mMessageCallback == null) {
                 Log.w(TAG, "No handler set for port [" + mPortId + "], dropping message "
                         + message);
                 return;
             }
-            mWebEventHandler.onMessage(message, ports);
+            mMessageCallback.onMessage(message, ports);
         }
     }
 

android_webview/javatests/src/org/chromium/android_webview/test/PostMessageTest.java

@@ -259,7 +259,7 @@ public class PostMessageTest extends AwTestBase {
             public void run() {
                 MessagePort[] channel = mAwContents.createMessageChannel();
                 // set a web event handler, this puts the port in a started state.
-                channel[1].setWebEventHandler(new MessagePort.WebEventHandler() {
+                channel[1].setMessageCallback(new MessagePort.MessageCallback() {
                     @Override
                     public void onMessage(String message, MessagePort[] sentPorts) { }
                 }, null);
@@ -311,7 +311,7 @@ public class PostMessageTest extends AwTestBase {
             public void run() {
                 MessagePort[] channel1 = mAwContents.createMessageChannel();
                 // set a web event handler, this puts the port in a started state.
-                channel1[1].setWebEventHandler(new MessagePort.WebEventHandler() {
+                channel1[1].setMessageCallback(new MessagePort.MessageCallback() {
                     @Override
                     public void onMessage(String message, MessagePort[] sentPorts) { }
                 }, null);
@@ -584,7 +584,7 @@ public class PostMessageTest extends AwTestBase {
                 MessagePort[] channel = mAwContents.createMessageChannel();
                 // verify communication from JS to Java.
                 channelContainer.set(channel);
-                channel[0].setWebEventHandler(new MessagePort.WebEventHandler() {
+                channel[0].setMessageCallback(new MessagePort.MessageCallback() {
                     @Override
                     public void onMessage(String message, MessagePort[] sentPorts) {
                         channelContainer.setMessage(message);
@@ -665,7 +665,7 @@ public class PostMessageTest extends AwTestBase {
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
-                channel[0].setWebEventHandler(new MessagePort.WebEventHandler() {
+                channel[0].setMessageCallback(new MessagePort.MessageCallback() {
                     @Override
                     public void onMessage(String message, MessagePort[] sentPorts) {
                         channelContainer.setMessage(message);
@@ -695,7 +695,7 @@ public class PostMessageTest extends AwTestBase {
             @Override
             public void run() {
                 MessagePort[] channel = mAwContents.createMessageChannel();
-                channel[0].setWebEventHandler(new MessagePort.WebEventHandler() {
+                channel[0].setMessageCallback(new MessagePort.MessageCallback() {
                     @Override
                     public void onMessage(String message, MessagePort[] sentPorts) {
                         channelContainer.setMessage(message);
@@ -722,7 +722,7 @@ public class PostMessageTest extends AwTestBase {
             @Override
             public void run() {
                 MessagePort[] channel = mAwContents.createMessageChannel();
-                channel[1].setWebEventHandler(new MessagePort.WebEventHandler() {
+                channel[1].setMessageCallback(new MessagePort.MessageCallback() {
                     @Override
                     public void onMessage(String message, MessagePort[] sentPorts) {
                         channelContainer.setMessage(message);
@@ -789,10 +789,10 @@ public class PostMessageTest extends AwTestBase {
                 MessagePort[] channel = mAwContents.createMessageChannel();
                 mAwContents.postMessageToFrame(null, "1", mWebServer.getBaseUrl(),
                         new MessagePort[]{channel[1]});
-                channel[0].setWebEventHandler(new MessagePort.WebEventHandler() {
+                channel[0].setMessageCallback(new MessagePort.MessageCallback() {
                     @Override
                     public void onMessage(String message, final MessagePort[] p) {
-                        p[0].setWebEventHandler(new MessagePort.WebEventHandler() {
+                        p[0].setMessageCallback(new MessagePort.MessageCallback() {
                             @Override
                             public void onMessage(String message, MessagePort[] q) {
                                 assertEquals("3", message);
@@ -849,8 +849,8 @@ public class PostMessageTest extends AwTestBase {
             return mPort.isClosed();
         }
         @Override
-        public void setWebEventHandler(WebEventHandler webEventHandler, Handler handler) {
-            mPort.setWebEventHandler(webEventHandler, handler);
+        public void setMessageCallback(MessageCallback messageCallback, Handler handler) {
+            mPort.setMessageCallback(messageCallback, handler);
         }
         @Override
         public void onMessage(String message, MessagePort[] sentPorts) {
@@ -982,7 +982,7 @@ public class PostMessageTest extends AwTestBase {
             public void run() {
                 MessagePort[] channel = mAwContents.createMessageChannel();
                 channelContainer.set(channel);
-                channel[0].setWebEventHandler(new MessagePort.WebEventHandler() {
+                channel[0].setMessageCallback(new MessagePort.MessageCallback() {
                     @Override
                     public void onMessage(String message, MessagePort[] sentPorts) {
                         channelContainer.setMessage(message);
@@ -1012,7 +1012,7 @@ public class PostMessageTest extends AwTestBase {
             public void run() {
                 MessagePort[] channel = mAwContents.createMessageChannel();
                 channelContainer.set(channel);
-                channel[0].setWebEventHandler(new MessagePort.WebEventHandler() {
+                channel[0].setMessageCallback(new MessagePort.MessageCallback() {
                     @Override
                     public void onMessage(String message, MessagePort[] sentPorts) {
                         channelContainer.setMessage(message);
@@ -1055,7 +1055,7 @@ public class PostMessageTest extends AwTestBase {
             public void run() {
                 MessagePort[] channel = mAwContents.createMessageChannel();
                 channelContainer.set(channel);
-                channel[0].setWebEventHandler(new MessagePort.WebEventHandler() {
+                channel[0].setMessageCallback(new MessagePort.MessageCallback() {
                     @Override
                     public void onMessage(String message, MessagePort[] sentPorts) {
                         channelContainer.setMessage(message);
@@ -1091,7 +1091,7 @@ public class PostMessageTest extends AwTestBase {
             public void run() {
                 MessagePort[] channel = mAwContents.createMessageChannel();
                 channelContainer.set(channel);
-                channel[0].setWebEventHandler(new MessagePort.WebEventHandler() {
+                channel[0].setMessageCallback(new MessagePort.MessageCallback() {
                     @Override
                     public void onMessage(String message, MessagePort[] sentPorts) {
                         channelContainer.setMessage(message);