Rename WebEventHandler to MessageCallback

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

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // 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.test;
 
 import android.os.Build;
 import android.os.Handler;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.webkit.JavascriptInterface;
@@ skipping 241 matching lines @@
     @SmallTest
     @Feature({"AndroidWebView", "Android-PostMessage"})
     public void testStartedPortCannotBeTransferredUsingPostMessageToFrame2() throws Throwable {
         loadPage(TEST_PAGE);
         final CountDownLatch latch = new CountDownLatch(1);
         runTestOnUiThread(new Runnable() {
             @Override
             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);
                 try {
                     mAwContents.postMessageToFrame(null, "2", mWebServer.getBaseUrl(),
                             new MessagePort[]{channel[1]});
                 } catch (IllegalStateException ex) {
                     latch.countDown();
                     return;
                 }
@@ skipping 31 matching lines @@
     @SmallTest
     @Feature({"AndroidWebView", "Android-PostMessage"})
     public void testStartedPortCannotBeTransferredUsingMessageChannel2() throws Throwable {
         loadPage(TEST_PAGE);
         final CountDownLatch latch = new CountDownLatch(1);
         runTestOnUiThread(new Runnable() {
             @Override
             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);
                 MessagePort[] channel2 = mAwContents.createMessageChannel();
                 try {
                     channel2[0].postMessage("1", new MessagePort[]{channel1[1]});
                 } catch (IllegalStateException ex) {
                     latch.countDown();
                     return;
                 }
@@ skipping 252 matching lines @@
     @Feature({"AndroidWebView", "Android-PostMessage"})
     public void testReceiveMessageInBackgroundThread() throws Throwable {
         loadPage(TEST_PAGE);
         final ChannelContainer channelContainer = new ChannelContainer();
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
                 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);
                     }
                 }, null);
                 mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
                         new MessagePort[]{channel[1]});
             }
         });
         mMessageObject.waitForMessage();
@@ skipping 60 matching lines @@
                     public MessagePort[] call() {
                         return mAwContents.createMessageChannel();
                     }
                 });
 
         waitUntilPortReady(channel[0]);
         waitUntilPortReady(channel[1]);
         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);
                     }
                 }, null);
                 mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
                         new MessagePort[]{channel[1]});
                 channel[0].postMessage(HELLO, null);
             }
         });
         // wait for the asynchronous response from JS
         channelContainer.waitForMessage();
         assertEquals(HELLO + JS_MESSAGE, channelContainer.getMessage());
     }
 
     // Verify that a message port can be used immediately (even if it is in
     // pending state) after creation. In particular make sure the message port can be
     // transferred to JS and full communication can happen on it.
     // Do this by sending a message to JS and let it echo'ing the message with
     // some text prepended to it.
     @SmallTest
     @Feature({"AndroidWebView", "Android-PostMessage"})
     public void testMessageChannelUsingPendingPort() throws Throwable {
         final ChannelContainer channelContainer = new ChannelContainer();
         loadPage(ECHO_PAGE);
         runTestOnUiThread(new Runnable() {
             @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);
                     }
                 }, null);
                 mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
                         new MessagePort[]{channel[1]});
                 channel[0].postMessage(HELLO, null);
             }
         });
         // Wait for the asynchronous response from JS.
         channelContainer.waitForMessage();
         assertEquals(HELLO + JS_MESSAGE, channelContainer.getMessage());
     }
 
     // Verify that a message port can be used for message transfer when both
     // ports are owned by same Webview.
     @SmallTest
     @Feature({"AndroidWebView", "Android-PostMessage"})
     public void testMessageChannelCommunicationWithinWebView() throws Throwable {
         final ChannelContainer channelContainer = new ChannelContainer();
         loadPage(ECHO_PAGE);
         runTestOnUiThread(new Runnable() {
             @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);
                     }
                 }, null);
                 channel[0].postMessage(HELLO, null);
             }
         });
         // Wait for the asynchronous response from JS.
         channelContainer.waitForMessage();
@@ skipping 46 matching lines @@
     @SmallTest
     @Feature({"AndroidWebView", "Android-PostMessage"})
     public void testCanUseReceivedMessagePortFromJS() throws Throwable {
         loadPage(RECEIVE_JS_MESSAGE_CHANNEL_PAGE);
         runTestOnUiThread(new Runnable() {
             @Override
             public void run() {
                 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);
                                 p[0].postMessage("4", null);
                             }
                         }, null);
                         p[0].postMessage("2", null);
                     }
                 }, null);
             }
@@ skipping 36 matching lines @@
         }
         @Override
         public void close() {
             mPort.close();
         }
         @Override
         public boolean isClosed() {
             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) {
             mPort.onMessage(message, sentPorts);
         }
         @Override
         public void postMessage(String message, MessagePort[] sentPorts) throws
                 IllegalStateException {
             mPort.postMessage(message, sentPorts);
         }
@@ skipping 111 matching lines @@
         triggerPopup(mAwContents, mContentsClient, mWebServer, MAIN_PAGE_FOR_POPUP_TEST, ECHO_PAGE,
                 POPUP_URL, "createPopup()");
         connectPendingPopup(mAwContents);
         final ChannelContainer channelContainer = new ChannelContainer();
 
         runTestOnUiThread(new Runnable() {
             @Override
             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);
                     }
                 }, null);
                 mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
                         new MessagePort[] {channel[1]});
                 channel[0].postMessage(HELLO, null);
             }
         });
         channelContainer.waitForMessage();
         assertEquals(HELLO + JS_MESSAGE, channelContainer.getMessage());
     }
 
     // Test if WebView can post a message from/to an iframe in a popup window.
     @SmallTest
     @Feature({"AndroidWebView", "Android-PostMessage"})
     public void testPostMessageToIframeInsidePopup() throws Throwable {
         mWebServer.setResponse(IFRAME_URL, ECHO_PAGE, null);
         triggerPopup(mAwContents, mContentsClient, mWebServer, MAIN_PAGE_FOR_POPUP_TEST,
                 POPUP_PAGE_WITH_IFRAME, POPUP_URL, "createPopup()");
         connectPendingPopup(mAwContents);
         final ChannelContainer channelContainer = new ChannelContainer();
 
         runTestOnUiThread(new Runnable() {
             @Override
             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);
                     }
                 }, null);
                 mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
                         new MessagePort[] {channel[1]});
                 channel[0].postMessage(HELLO, null);
             }
         });
@@ skipping 22 matching lines @@
     @SmallTest
     @Feature({"AndroidWebView", "Android-PostMessage"})
     public void testPostUnsupportedWebMessageToApp() throws Throwable {
         loadPage(TEST_PAGE_FOR_UNSUPPORTED_MESSAGES);
         final ChannelContainer channelContainer = new ChannelContainer();
         runTestOnUiThread(new Runnable() {
             @Override
             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);
                     }
                 }, null);
                 mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
                         new MessagePort[] {channel[1]});
             }
         });
         channelContainer.waitForMessage();
@@ skipping 15 matching lines @@
     @SmallTest
     @Feature({"AndroidWebView", "Android-PostMessage"})
     public void testTransferEmptyPortsArray() throws Throwable {
         loadPage(TEST_TRANSFER_EMPTY_PORTS);
         final ChannelContainer channelContainer = new ChannelContainer(2);
         runTestOnUiThread(new Runnable() {
             @Override
             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);
                     }
                 }, null);
                 mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
                         new MessagePort[] {channel[1]});
             }
         });
         channelContainer.waitForMessage();
         assertEquals("12", channelContainer.getMessage());
     }
 }