WebContentsObserver update for PlzNavigate methods

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.NavigationHandle;
 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;
@@ skipping 31 matching lines @@
      * {@link CustomTabsSessionToken} with a new {@link WebContents} and the {@link Tab} that
      * contains it.
      * @param webContents The new {@link WebContents} that the session got associated with.
      */
     public void reset(final WebContents webContents) {
         if (mOrigin == null) return;
         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) {
+            public void didFinishNavigation(NavigationHandle navigation) {

[Maria, 2016/12/27 19:31:10]

I think this should now include a check that we are in main frame navigation.

+                if (mNavigatedOnce && !navigation.isSamePage() && mChannel != null) {
                     mChannel[0].close();
                     mChannel = null;
                     mSenderDelegate = null;
                     mPostMessageSender = null;
                     webContents.removeObserver(this);
                     return;
                 }
                 mNavigatedOnce = true;
             }
 
@@ skipping 60 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;
     }
 }