PlzNavigate: Chrome UI changes for new methods of WebContentsObserver

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

Index: chrome/android/java/src/org/chromium/chrome/browser/tab/TabObserver.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabObserver.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabObserver.java
index 5a01b44d8a5cb320e027f6d41d8a93a5dff3a5cf..39bf95560996dbfa75e6c81b49e20612bdb07027 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabObserver.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabObserver.java
@@ -201,56 +201,19 @@ public interface TabObserver {
      * @param failingUrl        The url that was loading when the error occurred.
      */
     void onDidFailLoad(
-            Tab tab, boolean isProvisionalLoad, boolean isMainFrame, int errorCode,
-            String description, String failingUrl);
-
-    /**
-     * Called when load is started for a given frame.
-     * @param tab            The notifying {@link Tab}.
-     * @param isMainFrame    Whether the load is happening for the main frame.
-     * @param validatedUrl   The validated URL that is being navigated to.
-     */
-    public void onDidStartProvisionalLoadForFrame(
-            Tab tab, boolean isMainFrame, String validatedUrl);
-
-    /**
-     * Notifies that the provisional load was successfully committed. The RenderViewHost is now
-     * the current RenderViewHost of the WebContents.
-     *
-     * @param tab            The notifying {@link Tab}.
-     * @param frameId        A positive, non-zero integer identifying the navigating frame.
-     * @param isMainFrame    Whether the load is happening for the main frame.
-     * @param url            The committed URL being navigated to.
-     * @param transitionType The transition type as defined in
-     *                       {@link org.chromium.ui.base.PageTransitionTypes} for the load.
-     */
-    public void onDidCommitProvisionalLoadForFrame(
-            Tab tab, long frameId, boolean isMainFrame, String url, int transitionType);
-
-    /**
-     * Called when the main frame of the page has committed.
-     *
-     * @param tab                         The notifying {@link Tab}.
-     * @param url                         The validated url for the page.
-     * @param baseUrl                     The validated base url for the page.
-     * @param isNavigationToDifferentPage Whether the main frame navigated to a different page.
-     * @param isFragmentNavigation        Whether the main frame navigation did not cause changes
-     *                                    to the document (for example scrolling to a named anchor
-     *                                    or PopState).
-     * @param statusCode                  The HTTP status code of the navigation.
-     */
-    public void onDidNavigateMainFrame(Tab tab, String url, String baseUrl,
-            boolean isNavigationToDifferentPage, boolean isFragmentNavigation, int statusCode);
+            Tab tab, boolean isMainFrame, int errorCode, String description, String failingUrl);
 
     /**
      * Called when a navigation is started in the WebContents.
      * @param tab The notifying {@link Tab}.
      * @param url The validated URL for the loading page.
      * @param isInMainFrame Whether the navigation is for the main frame.
+     * @param isSamePage Whether the main frame navigation did not cause changes to the
+     *                   document (for example scrolling to a named anchor or PopState).
      * @param isErrorPage Whether the navigation shows an error page.
      */
     public void onDidStartNavigation(
-            Tab tab, String url, boolean isInMainFrame, boolean isErrorPage);
+            Tab tab, String url, boolean isInMainFrame, boolean isSamePage, boolean isErrorPage);
 
     /**
      * Called when a navigation is finished i.e. committed, aborted or replaced by a new one.
@@ -264,12 +227,17 @@ public interface TabObserver {
      *                     user on the previous page.
      * @param isSamePage Whether the main frame navigation did not cause changes to the
      *                   document (for example scrolling to a named anchor or PopState).
+     * @param isFragmentNavigation Whether the main frame navigation did not cause changes
+     *                             to the document (for example scrolling to a named anchor
+     *                             or PopState).
      * @param pageTransition The page transition type associated with this navigation.
      * @param errorCode The net error code if an error occurred prior to commit, otherwise net::OK.
+     * @param httpStatusCode The HTTP status code of the navigation.
      */
     public void onDidFinishNavigation(Tab tab, String url, boolean isInMainFrame,
             boolean isErrorPage, boolean hasCommitted, boolean isSamePage,
-            @Nullable Integer pageTransition, int errorCode);
+            boolean isFragmentNavigation, @Nullable Integer pageTransition, int errorCode,
+            int httpStatusCode);
 
     /**
      * Called when the page has painted something non-empty.
@@ -297,13 +265,6 @@ public interface TabObserver {
     public void onDidDetachInterstitialPage(Tab tab);
 
     /**
-     * Called when a navigation is started to a pending entry.
-     * @param tab The notifying {@link Tab}.
-     * @param url The url being navigated to.
-     */
-    public void onDidStartNavigationToPendingEntry(Tab tab, String url);
-
-    /**
      * Called when the background color for the tab has changed.
      * @param tab The notifying {@link Tab}.
      * @param color The current background color.