HTML MessagePort as mojo::MessagePipeHandle

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

 // Copyright 2016 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.chrome.browser.customtabs;
 
 import android.net.Uri;
 import android.support.customtabs.CustomTabsService;
 import android.support.customtabs.CustomTabsSessionToken;
 
 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;
 import org.chromium.content_public.browser.WebContentsObserver;
 
 /**
  * A class that handles postMessage communications with a designated {@link CustomTabsSessionToken}.
  */
 public class PostMessageHandler {
     private static AppWebMessagePortService sService;
 
     private final CustomTabsSessionToken mSession;
     private final MessageCallback mMessageCallback;
     private AppWebMessagePort[] mChannel;
-    private PostMessageSender mPostMessageSender;
-    private PostMessageSenderDelegate mSenderDelegate;
     private Uri mOrigin;
 
     private static AppWebMessagePortService getAppWebMessagePortService() {
         if (sService == null) sService = new AppWebMessagePortService();
         return sService;
     }
 
     /**
      * Basic constructor. Everytime the given {@link CustomTabsSessionToken} is associated with a
      * new {@link WebContents},
@@ skipping 23 matching lines @@
         new WebContentsObserver(webContents) {
             private boolean mNavigatedOnce;
 
             @Override
             public void didNavigateMainFrame(String url, String baseUrl,
                     boolean isNavigationToDifferentPage, boolean isFragmentNavigation,
                     int statusCode) {
                 if (mNavigatedOnce && isNavigationToDifferentPage && mChannel != null) {
                     mChannel[0].close();
                     mChannel = null;
-                    mSenderDelegate = null;
-                    mPostMessageSender = null;
                     webContents.removeObserver(this);
                     return;
                 }
                 mNavigatedOnce = true;
             }
 
             @Override
             public void documentLoadedInFrame(long frameId, boolean isMainFrame) {
                 if (!isMainFrame || mChannel != null) return;
 
                 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]});

[Yusuf, 2017/01/26 22:53:54]

Thanks for the cleanup! This looks much simpler now. You will need a rebase :)

 
-                    @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);
             }
         };
     }
 
     /**
      * Sets the postMessage origin for this session to the given {@link Uri}.
      * @param origin The origin value to be set.
      */
     public void setPostMessageOrigin(Uri origin) {
         mOrigin = origin;
@@ skipping 14 matching lines @@
             public void run() {
                 // It is still possible that the page has navigated while this task is in the queue.
                 // If that happens fail gracefully.
                 if (mChannel == null || mChannel[0].isClosed()) return;
                 mChannel[0].postMessage(message, null);
             }
         });
         return CustomTabsService.RESULT_SUCCESS;
     }
 }