Android: Remove DEPS exception rule for AppWebMessagePort

AppWebMessagePort is the only implementation of the interface MessagePort.
Replaced the direct reference to the class with the interface and added
a public helper method |MessagePort.createPair()|. That makes
AppWebMessagePort an implementation detail, and exposes only the public
interface to embedders. Updated DEPS rules to remove the exception.

Bug: 617324
Change-Id: I3f35c2db2436bc3c82a00c07cfede1062d447d29
Reviewed-on: https://chromium-review.googlesource.com/1031690
Commit-Queue: Jinsuk Kim <jinsukkim@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#554689}

android_webview/glue/java/DEPS

@@ -5,6 +5,5 @@ include_rules = [
 
   "-content/public/android/java",
   "+content/public/android/java/src/org/chromium/content_public",
-  "!content/public/android/java/src/org/chromium/content/browser/AppWebMessagePort.java",
   "!content/public/android/java/src/org/chromium/content/browser/selection/LGEmailActionModeWorkaround.java",
 ]

android_webview/glue/java/src/com/android/webview/chromium/WebMessagePortAdapter.java

@@ -10,7 +10,6 @@ import android.os.Handler;
 import android.webkit.WebMessage;
 import android.webkit.WebMessagePort;
 
-import org.chromium.content.browser.AppWebMessagePort;
 import org.chromium.content_public.browser.MessagePort;
 
 /**
@@ -66,7 +65,7 @@ public class WebMessagePortAdapter extends WebMessagePort {
 
     public static MessagePort[] toMessagePorts(WebMessagePort[] webMessagePorts) {
         if (webMessagePorts == null) return null;
-        MessagePort[] ports = new AppWebMessagePort[webMessagePorts.length];
+        MessagePort[] ports = new MessagePort[webMessagePorts.length];
         for (int i = 0; i < webMessagePorts.length; i++) {
             ports[i] = ((WebMessagePortAdapter) webMessagePorts[i]).getPort();
         }

android_webview/java/DEPS

@@ -10,7 +10,6 @@ include_rules = [
 
   "-content/public/android/java",
   "+content/public/android/java/src/org/chromium/content_public",
-  "!content/public/android/java/src/org/chromium/content/browser/AppWebMessagePort.java",
   "!content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java",
   "!content/public/android/java/src/org/chromium/content/browser/ChildProcessCreationParams.java",
   "!content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncherHelper.java",

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

@@ -63,7 +63,6 @@ import org.chromium.blink_public.web.WebReferrerPolicy;
 import org.chromium.components.autofill.AutofillProvider;
 import org.chromium.components.navigation_interception.InterceptNavigationDelegate;
 import org.chromium.components.navigation_interception.NavigationParams;
-import org.chromium.content.browser.AppWebMessagePort;
 import org.chromium.content.browser.ContentViewStatics;
 import org.chromium.content_public.browser.ChildProcessImportance;
 import org.chromium.content_public.browser.ContentViewCore;
@@ -2413,10 +2412,10 @@ public class AwContents implements SmartClipProvider {
     /**
      * Creates a message channel and returns the ports for each end of the channel.
      */
-    public AppWebMessagePort[] createMessageChannel() {
+    public MessagePort[] createMessageChannel() {
         if (TRACE) Log.i(TAG, "%s createMessageChannel", this);
         if (isDestroyedOrNoOperation(WARN)) return null;
-        return AppWebMessagePort.createPair();
+        return MessagePort.createPair();
     }
 
     public boolean hasAccessedInitialDocument() {

android_webview/javatests/DEPS

@@ -9,7 +9,6 @@ include_rules = [
 
   "-content/public/android/java",
   "+content/public/android/java/src/org/chromium/content_public",
-  "!content/public/android/java/src/org/chromium/content/browser/AppWebMessagePort.java",
   "!content/public/android/java/src/org/chromium/content/browser/ContentVideoView.java",
   "!content/public/android/java/src/org/chromium/content/browser/ContentViewStatics.java",
   "!content/public/android/java/src/org/chromium/content/common/ContentSwitches.java",

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

@@ -26,10 +26,10 @@ import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.DisabledTest;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.RetryOnFailure;
-import org.chromium.content.browser.AppWebMessagePort;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageFinishedHelper;
+import org.chromium.content_public.browser.MessagePort;
 import org.chromium.net.test.util.TestWebServer;
 
 import java.util.concurrent.CountDownLatch;
@@ -210,13 +210,13 @@ public class PostMessageTest {
         loadPage(TEST_PAGE);
         final CountDownLatch latch = new CountDownLatch(1);
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+            MessagePort[] channel = mAwContents.createMessageChannel();
             mAwContents.postMessageToFrame(
-                    null, "1", mWebServer.getBaseUrl(), new AppWebMessagePort[]{channel[1]});
+                    null, "1", mWebServer.getBaseUrl(), new MessagePort[] {channel[1]});
             // Retransfer the port. This should fail with an exception.
             try {
-                mAwContents.postMessageToFrame(null, "2", mWebServer.getBaseUrl(),
-                        new AppWebMessagePort[]{channel[1]});
+                mAwContents.postMessageToFrame(
+                        null, "2", mWebServer.getBaseUrl(), new MessagePort[] {channel[1]});
             } catch (IllegalStateException ex) {
                 latch.countDown();
                 return;
@@ -238,11 +238,11 @@ public class PostMessageTest {
         loadPage(TEST_PAGE);
         final CountDownLatch latch = new CountDownLatch(1);
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+            MessagePort[] channel = mAwContents.createMessageChannel();
             channel[1].postMessage("1", null);
             try {
-                mAwContents.postMessageToFrame(null, "2", mWebServer.getBaseUrl(),
-                        new AppWebMessagePort[]{channel[1]});
+                mAwContents.postMessageToFrame(
+                        null, "2", mWebServer.getBaseUrl(), new MessagePort[] {channel[1]});
             } catch (IllegalStateException ex) {
                 latch.countDown();
                 return;
@@ -260,13 +260,13 @@ public class PostMessageTest {
         loadPage(TEST_PAGE);
         final CountDownLatch latch = new CountDownLatch(1);
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+            MessagePort[] channel = mAwContents.createMessageChannel();
             // set a web event handler, this puts the port in a started state.
             channel[1].setMessageCallback((message, sentPorts) -> {
             }, null);
             try {
-                mAwContents.postMessageToFrame(null, "2", mWebServer.getBaseUrl(),
-                        new AppWebMessagePort[]{channel[1]});
+                mAwContents.postMessageToFrame(
+                        null, "2", mWebServer.getBaseUrl(), new MessagePort[] {channel[1]});
             } catch (IllegalStateException ex) {
                 latch.countDown();
                 return;
@@ -285,11 +285,11 @@ public class PostMessageTest {
         loadPage(TEST_PAGE);
         final CountDownLatch latch = new CountDownLatch(1);
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel1 = mAwContents.createMessageChannel();
+            MessagePort[] channel1 = mAwContents.createMessageChannel();
             channel1[1].postMessage("1", null);
-            AppWebMessagePort[] channel2 = mAwContents.createMessageChannel();
+            MessagePort[] channel2 = mAwContents.createMessageChannel();
             try {
-                channel2[0].postMessage("2", new AppWebMessagePort[]{channel1[1]});
+                channel2[0].postMessage("2", new MessagePort[] {channel1[1]});
             } catch (IllegalStateException ex) {
                 latch.countDown();
                 return;
@@ -307,13 +307,13 @@ public class PostMessageTest {
         loadPage(TEST_PAGE);
         final CountDownLatch latch = new CountDownLatch(1);
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel1 = mAwContents.createMessageChannel();
+            MessagePort[] channel1 = mAwContents.createMessageChannel();
             // set a web event handler, this puts the port in a started state.
             channel1[1].setMessageCallback((message, sentPorts) -> {
             }, null);
-            AppWebMessagePort[] channel2 = mAwContents.createMessageChannel();
+            MessagePort[] channel2 = mAwContents.createMessageChannel();
             try {
-                channel2[0].postMessage("1", new AppWebMessagePort[]{channel1[1]});
+                channel2[0].postMessage("1", new MessagePort[] {channel1[1]});
             } catch (IllegalStateException ex) {
                 latch.countDown();
                 return;
@@ -338,9 +338,9 @@ public class PostMessageTest {
         loadPage(TEST_PAGE);
         final CountDownLatch latch = new CountDownLatch(1);
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+            MessagePort[] channel = mAwContents.createMessageChannel();
             try {
-                channel[0].postMessage("1", new AppWebMessagePort[]{channel[0]});
+                channel[0].postMessage("1", new MessagePort[] {channel[0]});
             } catch (IllegalStateException ex) {
                 latch.countDown();
                 return;
@@ -358,11 +358,11 @@ public class PostMessageTest {
         loadPage(TEST_PAGE);
         final CountDownLatch latch = new CountDownLatch(1);
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+            MessagePort[] channel = mAwContents.createMessageChannel();
             channel[1].close();
             try {
-                mAwContents.postMessageToFrame(null, "1", mWebServer.getBaseUrl(),
-                        new AppWebMessagePort[]{channel[1]});
+                mAwContents.postMessageToFrame(
+                        null, "1", mWebServer.getBaseUrl(), new MessagePort[] {channel[1]});
             } catch (IllegalStateException ex) {
                 latch.countDown();
                 return;
@@ -380,11 +380,11 @@ public class PostMessageTest {
         loadPage(TEST_PAGE);
         final CountDownLatch latch = new CountDownLatch(1);
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel1 = mAwContents.createMessageChannel();
-            AppWebMessagePort[] channel2 = mAwContents.createMessageChannel();
+            MessagePort[] channel1 = mAwContents.createMessageChannel();
+            MessagePort[] channel2 = mAwContents.createMessageChannel();
             channel2[1].close();
             try {
-                channel1[0].postMessage("1", new AppWebMessagePort[]{channel2[1]});
+                channel1[0].postMessage("1", new MessagePort[] {channel2[1]});
             } catch (IllegalStateException ex) {
                 latch.countDown();
                 return;
@@ -402,7 +402,7 @@ public class PostMessageTest {
         loadPage(TEST_PAGE);
         final CountDownLatch latch = new CountDownLatch(1);
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+            MessagePort[] channel = mAwContents.createMessageChannel();
             channel[0].close();
             try {
                 channel[0].postMessage("1", null);
@@ -422,9 +422,9 @@ public class PostMessageTest {
     public void testMessagesPostedBeforeClosingPortAreTransferred() throws Throwable {
         loadPage(TITLE_FROM_POSTMESSAGE_TO_CHANNEL);
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+            MessagePort[] channel = mAwContents.createMessageChannel();
             mAwContents.postMessageToFrame(
-                    null, "1", mWebServer.getBaseUrl(), new AppWebMessagePort[]{channel[1]});
+                    null, "1", mWebServer.getBaseUrl(), new MessagePort[] {channel[1]});
             channel[0].postMessage("2", null);
             channel[0].postMessage("3", null);
             channel[0].close();
@@ -440,9 +440,9 @@ public class PostMessageTest {
         loadPage(TEST_PAGE);
         final CountDownLatch latch = new CountDownLatch(1);
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+            MessagePort[] channel = mAwContents.createMessageChannel();
             mAwContents.postMessageToFrame(
-                    null, "1", mWebServer.getBaseUrl(), new AppWebMessagePort[]{channel[1]});
+                    null, "1", mWebServer.getBaseUrl(), new MessagePort[] {channel[1]});
             try {
                 channel[1].close();
             } catch (IllegalStateException ex) {
@@ -462,11 +462,11 @@ public class PostMessageTest {
         loadPage(TEST_PAGE);
         final CountDownLatch latch = new CountDownLatch(1);
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel1 = mAwContents.createMessageChannel();
+            MessagePort[] channel1 = mAwContents.createMessageChannel();
             mAwContents.postMessageToFrame(
-                    null, "1", mWebServer.getBaseUrl(), new AppWebMessagePort[]{channel1[1]});
-            AppWebMessagePort[] channel2 = mAwContents.createMessageChannel();
-            channel1[0].postMessage("2", new AppWebMessagePort[]{channel2[0]});
+                    null, "1", mWebServer.getBaseUrl(), new MessagePort[] {channel1[1]});
+            MessagePort[] channel2 = mAwContents.createMessageChannel();
+            channel1[0].postMessage("2", new MessagePort[] {channel2[0]});
             try {
                 channel2[0].close();
             } catch (IllegalStateException ex) {
@@ -486,18 +486,18 @@ public class PostMessageTest {
     public void testPendingPortCanBeTransferredInPendingPort() throws Throwable {
         loadPage(TITLE_FROM_POSTMESSAGE_TO_CHANNEL);
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel1 = mAwContents.createMessageChannel();
+            MessagePort[] channel1 = mAwContents.createMessageChannel();
             mAwContents.postMessageToFrame(
-                    null, "1", mWebServer.getBaseUrl(), new AppWebMessagePort[]{channel1[1]});
-            AppWebMessagePort[] channel2 = mAwContents.createMessageChannel();
-            channel1[0].postMessage("2", new AppWebMessagePort[]{channel2[0]});
+                    null, "1", mWebServer.getBaseUrl(), new MessagePort[] {channel1[1]});
+            MessagePort[] channel2 = mAwContents.createMessageChannel();
+            channel1[0].postMessage("2", new MessagePort[] {channel2[0]});
         });
         expectTitle("2");
     }
 
     private static class ChannelContainer {
         private boolean mReady;
-        private AppWebMessagePort[] mChannel;
+        private MessagePort[] mChannel;
         private final Object mLock = new Object();
         private String mMessage = "";
         private Looper mLastLooper;
@@ -512,10 +512,10 @@ public class PostMessageTest {
             mWaitCount = n;
         }
 
-        public void set(AppWebMessagePort[] channel) {
+        public void set(MessagePort[] channel) {
             mChannel = channel;
         }
-        public AppWebMessagePort[] get() {
+        public MessagePort[] get() {
             return mChannel;
         }
 
@@ -566,13 +566,13 @@ public class PostMessageTest {
         loadPage(TEST_PAGE);
         final ChannelContainer channelContainer = new ChannelContainer();
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+            MessagePort[] channel = mAwContents.createMessageChannel();
             // verify communication from JS to Java.
             channelContainer.set(channel);
             channel[0].setMessageCallback(
                     (message, sentPorts) -> channelContainer.setMessage(message), null);
-            mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
-                    new AppWebMessagePort[]{channel[1]});
+            mAwContents.postMessageToFrame(
+                    null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(), new MessagePort[] {channel[1]});
         });
         mMessageObject.waitForMessage();
         Assert.assertEquals(WEBVIEW_MESSAGE, mMessageObject.getData());
@@ -613,14 +613,14 @@ public class PostMessageTest {
     public void testMessageChannelUsingInitializedPort() throws Throwable {
         final ChannelContainer channelContainer = new ChannelContainer();
         loadPage(ECHO_PAGE);
-        final AppWebMessagePort[] channel =
+        final MessagePort[] channel =
                 ThreadUtils.runOnUiThreadBlocking(() -> mAwContents.createMessageChannel());
 
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
             channel[0].setMessageCallback(
                     (message, sentPorts) -> channelContainer.setMessage(message), null);
-            mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
-                    new AppWebMessagePort[]{channel[1]});
+            mAwContents.postMessageToFrame(
+                    null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(), new MessagePort[] {channel[1]});
             channel[0].postMessage(HELLO, null);
         });
         // wait for the asynchronous response from JS
@@ -640,11 +640,11 @@ public class PostMessageTest {
         final ChannelContainer channelContainer = new ChannelContainer();
         loadPage(ECHO_PAGE);
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+            MessagePort[] channel = mAwContents.createMessageChannel();
             channel[0].setMessageCallback(
                     (message, sentPorts) -> channelContainer.setMessage(message), null);
-            mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
-                    new AppWebMessagePort[]{channel[1]});
+            mAwContents.postMessageToFrame(
+                    null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(), new MessagePort[] {channel[1]});
             channel[0].postMessage(HELLO, null);
         });
         // Wait for the asynchronous response from JS.
@@ -661,7 +661,7 @@ public class PostMessageTest {
         final ChannelContainer channelContainer = new ChannelContainer();
         loadPage(ECHO_PAGE);
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+            MessagePort[] channel = mAwContents.createMessageChannel();
             channel[1].setMessageCallback(
                     (message, sentPorts) -> channelContainer.setMessage(message), null);
             channel[0].postMessage(HELLO, null);
@@ -679,9 +679,9 @@ public class PostMessageTest {
     public void testPostMessageToFrameNotReordersMessages() throws Throwable {
         loadPage(TITLE_FROM_POSTMESSAGE_TO_FRAME);
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+            MessagePort[] channel = mAwContents.createMessageChannel();
             mAwContents.postMessageToFrame(
-                    null, "1", mWebServer.getBaseUrl(), new AppWebMessagePort[]{channel[1]});
+                    null, "1", mWebServer.getBaseUrl(), new MessagePort[] {channel[1]});
             mAwContents.postMessageToFrame(null, "2", mWebServer.getBaseUrl(), null);
             mAwContents.postMessageToFrame(null, "3", mWebServer.getBaseUrl(), null);
         });
@@ -718,9 +718,9 @@ public class PostMessageTest {
     public void testCanUseReceivedAwMessagePortFromJS() throws Throwable {
         loadPage(RECEIVE_JS_MESSAGE_CHANNEL_PAGE);
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+            MessagePort[] channel = mAwContents.createMessageChannel();
             mAwContents.postMessageToFrame(
-                    null, "1", mWebServer.getBaseUrl(), new AppWebMessagePort[]{channel[1]});
+                    null, "1", mWebServer.getBaseUrl(), new MessagePort[] {channel[1]});
             channel[0].setMessageCallback((message, p) -> {
                 p[0].setMessageCallback((message1, q) -> {
                     Assert.assertEquals("3", message1);
@@ -775,9 +775,9 @@ public class PostMessageTest {
                 CommonResources.getTextJavascriptHeaders(true));
         loadPage(TEST_PAGE_FOR_PORT_TRANSFER);
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+            MessagePort[] channel = mAwContents.createMessageChannel();
             mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
-                    new AppWebMessagePort[]{channel[0], channel[1]});
+                    new MessagePort[] {channel[0], channel[1]});
         });
         mMessageObject.waitForMessage();
         Assert.assertEquals(WORKER_MESSAGE, mMessageObject.getData());
@@ -821,12 +821,12 @@ public class PostMessageTest {
         final ChannelContainer channelContainer = new ChannelContainer();
 
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+            MessagePort[] channel = mAwContents.createMessageChannel();
             channelContainer.set(channel);
             channel[0].setMessageCallback(
                     (message, sentPorts) -> channelContainer.setMessage(message), null);
-            mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
-                    new AppWebMessagePort[]{channel[1]});
+            mAwContents.postMessageToFrame(
+                    null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(), new MessagePort[] {channel[1]});
             channel[0].postMessage(HELLO, null);
         });
         channelContainer.waitForMessage();
@@ -845,12 +845,12 @@ public class PostMessageTest {
         final ChannelContainer channelContainer = new ChannelContainer();
 
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+            MessagePort[] channel = mAwContents.createMessageChannel();
             channelContainer.set(channel);
             channel[0].setMessageCallback(
                     (message, sentPorts) -> channelContainer.setMessage(message), null);
-            mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
-                    new AppWebMessagePort[]{channel[1]});
+            mAwContents.postMessageToFrame(
+                    null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(), new MessagePort[] {channel[1]});
             channel[0].postMessage(HELLO, null);
         });
         channelContainer.waitForMessage();
@@ -880,12 +880,12 @@ public class PostMessageTest {
         loadPage(TEST_PAGE_FOR_UNSUPPORTED_MESSAGES);
         final ChannelContainer channelContainer = new ChannelContainer();
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+            MessagePort[] channel = mAwContents.createMessageChannel();
             channelContainer.set(channel);
             channel[0].setMessageCallback(
                     (message, sentPorts) -> channelContainer.setMessage(message), null);
-            mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
-                    new AppWebMessagePort[]{channel[1]});
+            mAwContents.postMessageToFrame(
+                    null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(), new MessagePort[] {channel[1]});
         });
         channelContainer.waitForMessage();
         Assert.assertEquals(JS_MESSAGE, channelContainer.getMessage());
@@ -910,12 +910,12 @@ public class PostMessageTest {
         loadPage(TEST_TRANSFER_EMPTY_PORTS);
         final ChannelContainer channelContainer = new ChannelContainer(2);
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+            MessagePort[] channel = mAwContents.createMessageChannel();
             channelContainer.set(channel);
             channel[0].setMessageCallback(
                     (message, sentPorts) -> channelContainer.setMessage(message), null);
-            mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
-                    new AppWebMessagePort[]{channel[1]});
+            mAwContents.postMessageToFrame(
+                    null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(), new MessagePort[] {channel[1]});
         });
         channelContainer.waitForMessage();
         Assert.assertEquals("12", channelContainer.getMessage());
@@ -937,12 +937,12 @@ public class PostMessageTest {
         final String longMessage = longMessageBuilder.toString();
 
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+            MessagePort[] channel = mAwContents.createMessageChannel();
             channelContainer.set(channel);
             channel[0].setMessageCallback(
                     (message, sentPorts) -> channelContainer.setMessage(message), null);
-            mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
-                    new AppWebMessagePort[] {channel[1]});
+            mAwContents.postMessageToFrame(
+                    null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(), new MessagePort[] {channel[1]});
             channel[0].postMessage(longMessage, null);
         });
         channelContainer.waitForMessage();
@@ -959,7 +959,7 @@ public class PostMessageTest {
         final HandlerThread thread = new HandlerThread("test-thread");
         thread.start();
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+            MessagePort[] channel = mAwContents.createMessageChannel();
             channelContainer1.set(channel);
             channelContainer2.set(channel);
             channel[0].setMessageCallback(
@@ -987,7 +987,7 @@ public class PostMessageTest {
         final HandlerThread thread = new HandlerThread("test-thread");
         thread.start();
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+            MessagePort[] channel = mAwContents.createMessageChannel();
             channelContainer.set(channel);
             channel[0].setMessageCallback((message, sentPorts)
                                                   -> channelContainer.setMessage(message),
@@ -999,7 +999,7 @@ public class PostMessageTest {
         Assert.assertEquals(thread.getLooper(), channelContainer.getLastLooper());
         final ChannelContainer channelContainer2 = new ChannelContainer(1);
         InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {
-            AppWebMessagePort[] channel = channelContainer.get();
+            MessagePort[] channel = channelContainer.get();
             channel[0].setMessageCallback(
                     (message, sentPorts) -> channelContainer2.setMessage(message), null);
             channel[1].postMessage("bar", null);

chrome/android/java/DEPS

@@ -22,7 +22,6 @@ include_rules = [
   "!content/public/android/java/src/org/chromium/content/app/ContentChildProcessServiceDelegate.java",
   "!content/public/android/java/src/org/chromium/content/browser/accessibility/WebContentsAccessibility.java",
   "!content/public/android/java/src/org/chromium/content/browser/ActivityContentVideoViewEmbedder.java",
-  "!content/public/android/java/src/org/chromium/content/browser/AppWebMessagePort.java",
   "!content/public/android/java/src/org/chromium/content/browser/BrowserStartupController.java",
   "!content/public/android/java/src/org/chromium/content/browser/ChildProcessCreationParams.java",
   "!content/public/android/java/src/org/chromium/content/browser/ChildProcessLauncherHelper.java",

chrome/android/java/src/org/chromium/chrome/browser/browserservices/PostMessageHandler.java

@@ -16,7 +16,6 @@ import org.chromium.base.ThreadUtils;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.chrome.browser.browserservices.OriginVerifier.OriginVerificationListener;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.content.browser.AppWebMessagePort;
 import org.chromium.content_public.browser.MessagePort;
 import org.chromium.content_public.browser.MessagePort.MessageCallback;
 import org.chromium.content_public.browser.WebContents;
@@ -31,7 +30,7 @@ public class PostMessageHandler
     private WebContents mWebContents;
     private boolean mMessageChannelCreated;
     private boolean mBoundToService;
-    private AppWebMessagePort[] mChannel;
+    private MessagePort[] mChannel;
     private Uri mPostMessageUri;
     private String mPackageName;
 
@@ -121,11 +120,11 @@ public class PostMessageHandler
     }
 
     private void initializeWithWebContents(final WebContents webContents) {
-        mChannel = (AppWebMessagePort[]) webContents.createMessageChannel();
+        mChannel = webContents.createMessageChannel();
         mChannel[0].setMessageCallback(mMessageCallback, null);
 
         webContents.postMessageToFrame(
-                null, "", mPostMessageUri.toString(), "", new AppWebMessagePort[] {mChannel[1]});
+                null, "", mPostMessageUri.toString(), "", new MessagePort[] {mChannel[1]});
 
         mMessageChannelCreated = true;
         if (mBoundToService) notifyMessageChannelReady(null);

content/public/android/java/src/org/chromium/content_public/browser/MessagePort.java

@@ -7,6 +7,7 @@ package org.chromium.content_public.browser;
 import android.os.Handler;
 
 import org.chromium.base.annotations.UsedByReflection;
+import org.chromium.content.browser.AppWebMessagePort;
 
 /**
  * Interface for message ports that handle postMessage requests.
@@ -25,6 +26,14 @@ public interface MessagePort {
         void onMessage(String message, MessagePort[] sentPorts);
     }
 
+    /**
+     * Called to create an entangled pair of ports.
+     * @return An array of a pair of{@link MessagePort} instances.
+     */
+    public static MessagePort[] createPair() {
+        return AppWebMessagePort.createPair();
+    }
+
     /**
      * Close the port for use.
      */