WebContentsObserver update for PlzNavigate methods

android_webview/java/src/org/chromium/android_webview/AwWebContentsObserver.java

 // Copyright 2014 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.android_webview;
 
 import org.chromium.android_webview.AwContents.VisualStateCallback;
 import org.chromium.base.ThreadUtils;
 import org.chromium.content_public.browser.WebContents;
 import org.chromium.content_public.browser.WebContentsObserver;
@@ skipping 69 matching lines @@
     }
 
     @Override
     public void titleWasSet(String title) {
         AwContentsClient client = mAwContentsClient.get();
         if (client == null) return;
         client.updateTitle(title, true);
     }
 
     @Override
-    public void didNavigateMainFrame(final String url, String baseUrl,
-            boolean isNavigationToDifferentPage, boolean isFragmentNavigation, int statusCode) {
+    public void didFinishNavigation(final String url, boolean isInMainFrame, boolean isErrorPage,
+            boolean hasCommitted, boolean isSamePage, boolean isReload) {
+        mCommittedNavigation = true;
+        AwContentsClient client = mAwContentsClient.get();
+        if (client != null) {
+            client.getCallbackHelper().postDoUpdateVisitedHistory(url, isReload);
+        }
+
         // Only invoke the onPageCommitVisible callback when navigating to a different page,
         // but not when navigating to a different fragment within the same page.
-        if (isNavigationToDifferentPage) {
+        if (isInMainFrame && !isSamePage) {
             ThreadUtils.postOnUiThread(new Runnable() {
                 @Override
                 public void run() {
                     AwContents awContents = mAwContents.get();
                     if (awContents != null) {
                         awContents.insertVisualStateCallbackIfNotDestroyed(
                                 0, new VisualStateCallback() {
                                     @Override
                                     public void onComplete(long requestId) {
                                         AwContentsClient client = mAwContentsClient.get();
                                         if (client == null) return;
                                         client.onPageCommitVisible(url);
                                     }
                                 });
                     }
                 }
             });
         }
 
         // This is here to emulate the Classic WebView firing onPageFinished for main frame
         // navigations where only the hash fragment changes.
-        if (isFragmentNavigation) {
-            AwContentsClient client = mAwContentsClient.get();
-            if (client == null) return;
+        if (isSamePage && client != null) {
             client.getCallbackHelper().postOnPageFinished(url);
         }
     }
 
-    @Override
-    public void didNavigateAnyFrame(String url, String baseUrl, boolean isReload) {
-        mCommittedNavigation = true;
-        final AwContentsClient client = mAwContentsClient.get();
-        if (client == null) return;
-        client.getCallbackHelper().postDoUpdateVisitedHistory(url, isReload);
-    }
-
     public boolean didEverCommitNavigation() {
         return mCommittedNavigation;
     }
 }