WebContentsObserver update for PlzNavigate methods

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..e83c98c3cb9ccd4fe954b1322113c57731d62642 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
@@ -17,6 +17,7 @@ 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;
 
@@ -68,10 +69,8 @@ public class PostMessageHandler {
             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;