HTML MessagePort as mojo::MessagePipeHandle

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

Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/PostMessageHandler.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/PostMessageHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/PostMessageHandler.java
index 4013ac46f01d0a029777bc470a076e19e55ebe57..28e7b2ff94ae1c71c867f29c4ecc14fe0d67eaca 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/PostMessageHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/PostMessageHandler.java
@@ -12,9 +12,6 @@ import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.content.browser.AppWebMessagePort;
 import org.chromium.content.browser.AppWebMessagePortService;
-import org.chromium.content.browser.AppWebMessagePortService.MessageChannelObserver;
-import org.chromium.content.browser.PostMessageSender;
-import org.chromium.content.browser.PostMessageSender.PostMessageSenderDelegate;
 import org.chromium.content_public.browser.MessagePort;
 import org.chromium.content_public.browser.MessagePort.MessageCallback;
 import org.chromium.content_public.browser.WebContents;
@@ -29,8 +26,6 @@ public class PostMessageHandler {
     private final CustomTabsSessionToken mSession;
     private final MessageCallback mMessageCallback;
     private AppWebMessagePort[] mChannel;
-    private PostMessageSender mPostMessageSender;
-    private PostMessageSenderDelegate mSenderDelegate;
     private Uri mOrigin;
 
     private static AppWebMessagePortService getAppWebMessagePortService() {
@@ -74,8 +69,6 @@ public class PostMessageHandler {
                 if (mNavigatedOnce && isNavigationToDifferentPage && mChannel != null) {
                     mChannel[0].close();
                     mChannel = null;
-                    mSenderDelegate = null;
-                    mPostMessageSender = null;
                     webContents.removeObserver(this);
                     return;
                 }
@@ -89,35 +82,10 @@ public class PostMessageHandler {
                 final AppWebMessagePortService service = getAppWebMessagePortService();
                 mChannel = (AppWebMessagePort[]) webContents.createMessageChannel(service);
                 mChannel[0].setMessageCallback(mMessageCallback, null);
-                mSenderDelegate = new PostMessageSenderDelegate() {
-                    @Override
-                    public void postMessageToWeb(
-                            String frameName, String message, String targetOrigin,
-                            int[] sentPortIds) {
-                        webContents.postMessageToFrame(
-                                frameName, message, targetOrigin, sentPortIds);
-                    }
 
-                    @Override
-                    public void onPostMessageQueueEmpty() {}
+                webContents.postMessageToFrame(null, "", "", new AppWebMessagePort[] {mChannel[1]});
 
-                    @Override
-                    public boolean isPostMessageSenderReady() {
-                        return true;
-                    }
-                };
-                mPostMessageSender = new PostMessageSender(
-                        mSenderDelegate, getAppWebMessagePortService());
-                service.addObserver(new MessageChannelObserver() {
-                    @Override
-                    public void onMessageChannelCreated() {
-                        service.removeObserver(this);
-                        if (mChannel == null) return;
-                        mPostMessageSender.postMessage(
-                                null, "", "", new AppWebMessagePort[] {mChannel[1]});
-                        mSession.getCallback().onMessageChannelReady(mOrigin, null);
-                    }
-                });
+                mSession.getCallback().onMessageChannelReady(mOrigin, null);
             }
         };
     }