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 9329a4513f3b1705cc67a6477df8f2cb824c9b5a..a8e528f503b50a6acc2ed60d88f4ae6f03cbc6e6 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
@@ -15,9 +15,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;
@@ -34,8 +31,6 @@ public class PostMessageHandler extends PostMessageServiceConnection {
     private boolean mMessageChannelCreated;
     private boolean mBoundToService;
     private AppWebMessagePort[] mChannel;
-    private PostMessageSender mPostMessageSender;
-    private PostMessageSenderDelegate mSenderDelegate;
     private Uri mOrigin;
 
     private static AppWebMessagePortService getAppWebMessagePortService() {
@@ -112,48 +107,16 @@ public class PostMessageHandler extends PostMessageServiceConnection {
         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) {
-                if (webContents.isDestroyed()) {
-                    disconnectChannel();
-                    unbindFromContext(ContextUtils.getApplicationContext());
-                    return;
-                }
-                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]});
-                mMessageChannelCreated = true;
-                if (mBoundToService) notifyMessageChannelReady(null);
-            }
-        });
+        mMessageChannelCreated = true;
+        if (mBoundToService) notifyMessageChannelReady(null);
     }
 
     private void disconnectChannel() {
         mChannel[0].close();
         mChannel = null;
-        mSenderDelegate = null;
-        mPostMessageSender = null;
         mWebContents = null;
     }