WebContentsObserver and TabObserver update for PlzNavigate

chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.java

Index: chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.java
index 7fe6078f54e75e97ce5d998d8e3010b3929a6dc6..bf4d756e1fa0d9738c2b3f0016c1bb4985a87122 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabWebContentsObserver.java
@@ -147,12 +147,6 @@ public class TabWebContentsObserver extends WebContentsObserver {
     }
 
     @Override
-    public void didFinishNavigation(
-            boolean isMainFrame, boolean isErrorPage, boolean hasCommitted) {
-        if (isMainFrame && hasCommitted) mTab.setIsShowingErrorPage(isErrorPage);
-    }
-
-    @Override
     public void didFinishLoad(long frameId, String validatedUrl, boolean isMainFrame) {
         if (isMainFrame) mTab.didFinishPageLoad();
         PolicyAuditor auditor =
@@ -254,6 +248,26 @@ public class TabWebContentsObserver extends WebContentsObserver {
     }
 
     @Override
+    public void didStartNavigation(String url, boolean isInMainFrame, boolean isErrorPage) {
+        RewindableIterator<TabObserver> observers = mTab.getTabObservers();
+        while (observers.hasNext()) {
+            observers.next().onDidStartNavigation(mTab, url, isInMainFrame, isErrorPage);
+        }
+    }
+
+    @Override
+    public void didFinishNavigation(String url, boolean isInMainFrame, boolean isErrorPage,
+            boolean hasCommitted, boolean isSamePage, Integer pageTransition, int errorCode) {
+        if (isInMainFrame && hasCommitted) mTab.setIsShowingErrorPage(isErrorPage);
+
+        RewindableIterator<TabObserver> observers = mTab.getTabObservers();
+        while (observers.hasNext()) {
+            observers.next().onDidFinishNavigation(mTab, url, isInMainFrame, isErrorPage,
+                    hasCommitted, isSamePage, pageTransition, errorCode);
+        }
+    }
+
+    @Override
     public void didFirstVisuallyNonEmptyPaint() {
         RewindableIterator<TabObserver> observers = mTab.getTabObservers();
         while (observers.hasNext()) {