PlzNavigate: Chrome UI changes for new methods of WebContentsObserver

content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java

Index: content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java
diff --git a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java
index 55602803342fb09c40b8f74947c98e55e0d568cc..0f43177249648efa9bc126eec5defebd946a4b89 100644
--- a/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java
+++ b/content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsObserverProxy.java
@@ -77,19 +77,23 @@ class WebContentsObserverProxy extends WebContentsObserver {
 
     @Override
     @CalledByNative
-    public void didStartNavigation(String url, boolean isInMainFrame, boolean isErrorPage) {
+    public void didStartNavigation(
+            String url, boolean isInMainFrame, boolean isSamePage, boolean isErrorPage) {
         for (mObserversIterator.rewind(); mObserversIterator.hasNext();) {
-            mObserversIterator.next().didStartNavigation(url, isInMainFrame, isErrorPage);
+            mObserversIterator.next().didStartNavigation(
+                    url, isInMainFrame, isSamePage, isErrorPage);
         }
     }
 
     @CalledByNative
     public void didFinishNavigation(String url, boolean isInMainFrame, boolean isErrorPage,
-            boolean hasCommitted, boolean isSamePage, int transition, int errorCode) {
+            boolean hasCommitted, boolean isSamePage, boolean isFragmentNavigation, int transition,
+            int errorCode, String errorDescription, int httpStatusCode) {
         Integer pageTransition = transition == -1 ? null : transition;
         for (mObserversIterator.rewind(); mObserversIterator.hasNext();) {
             mObserversIterator.next().didFinishNavigation(url, isInMainFrame, isErrorPage,
-                    hasCommitted, isSamePage, pageTransition, errorCode);
+                    hasCommitted, isSamePage, isFragmentNavigation, pageTransition, errorCode,
+                    errorDescription, httpStatusCode);
         }
     }
 
@@ -111,21 +115,10 @@ class WebContentsObserverProxy extends WebContentsObserver {
 
     @Override
     @CalledByNative
-    public void didFailLoad(boolean isProvisionalLoad, boolean isMainFrame, int errorCode,
-            String description, String failingUrl, boolean wasIgnoredByHandler) {
+    public void didFailLoad(
+            boolean isMainFrame, int errorCode, String description, String failingUrl) {
         for (mObserversIterator.rewind(); mObserversIterator.hasNext();) {
-            mObserversIterator.next().didFailLoad(isProvisionalLoad, isMainFrame, errorCode,
-                    description, failingUrl, wasIgnoredByHandler);
-        }
-    }
-
-    @Override
-    @CalledByNative
-    public void didNavigateMainFrame(String url, String baseUrl,
-            boolean isNavigationToDifferentPage, boolean isFragmentNavigation, int statusCode) {
-        for (mObserversIterator.rewind(); mObserversIterator.hasNext();) {
-            mObserversIterator.next().didNavigateMainFrame(
-                    url, baseUrl, isNavigationToDifferentPage, isFragmentNavigation, statusCode);
+            mObserversIterator.next().didFailLoad(isMainFrame, errorCode, description, failingUrl);
         }
     }
 
@@ -163,14 +156,6 @@ class WebContentsObserverProxy extends WebContentsObserver {
 
     @Override
     @CalledByNative
-    public void didNavigateAnyFrame(String url, String baseUrl, boolean isReload) {
-        for (mObserversIterator.rewind(); mObserversIterator.hasNext();) {
-            mObserversIterator.next().didNavigateAnyFrame(url, baseUrl, isReload);
-        }
-    }
-
-    @Override
-    @CalledByNative
     public void documentAvailableInMainFrame() {
         for (mObserversIterator.rewind(); mObserversIterator.hasNext();) {
             mObserversIterator.next().documentAvailableInMainFrame();
@@ -179,26 +164,6 @@ class WebContentsObserverProxy extends WebContentsObserver {
 
     @Override
     @CalledByNative
-    public void didStartProvisionalLoadForFrame(long frameId, long parentFrameId,
-            boolean isMainFrame, String validatedUrl, boolean isErrorPage) {
-        for (mObserversIterator.rewind(); mObserversIterator.hasNext();) {
-            mObserversIterator.next().didStartProvisionalLoadForFrame(
-                    frameId, parentFrameId, isMainFrame, validatedUrl, isErrorPage);
-        }
-    }
-
-    @Override
-    @CalledByNative
-    public void didCommitProvisionalLoadForFrame(
-            long frameId, boolean isMainFrame, String url, int transitionType) {
-        for (mObserversIterator.rewind(); mObserversIterator.hasNext();) {
-            mObserversIterator.next().didCommitProvisionalLoadForFrame(
-                    frameId, isMainFrame, url, transitionType);
-        }
-    }
-
-    @Override
-    @CalledByNative
     public void didFinishLoad(long frameId, String validatedUrl, boolean isMainFrame) {
         for (mObserversIterator.rewind(); mObserversIterator.hasNext();) {
             mObserversIterator.next().didFinishLoad(frameId, validatedUrl, isMainFrame);
@@ -247,14 +212,6 @@ class WebContentsObserverProxy extends WebContentsObserver {
 
     @Override
     @CalledByNative
-    public void didStartNavigationToPendingEntry(String url) {
-        for (mObserversIterator.rewind(); mObserversIterator.hasNext();) {
-            mObserversIterator.next().didStartNavigationToPendingEntry(url);
-        }
-    }
-
-    @Override
-    @CalledByNative
     public void destroy() {
         // Super destruction semantics (removing the observer from the
         // Java-based WebContents) are quite different, so we explicitly avoid