PlzNavigate: Chrome UI changes for new methods of WebContentsObserver

chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java b/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java
index dde1407799026c24823577eb68948f6a91dd86bd..15d887b6a6bd0c62be6fbcd216b554f5fb40e3e2 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/dom_distiller/ReaderModeManager.java
@@ -440,9 +440,8 @@ public class ReaderModeManager extends TabModelSelectorTabObserver
 
         return new WebContentsObserver(webContents) {
             @Override
-            public void didStartProvisionalLoadForFrame(long frameId, long parentFrameId,
-                    boolean isMainFrame, String validatedUrl, boolean isErrorPage) {
-                if (!isMainFrame) return;
+            public void didStartNavigation(String url, boolean isInMainFrame, boolean isErrorPage) {
+                if (!isInMainFrame) return;
                 // If there is a navigation in the current tab, hide the bar. It will show again
                 // once the distillability test is successful.
                 if (readerTabId == mTabModelSelector.getCurrentTabId()) {
@@ -453,20 +452,20 @@ public class ReaderModeManager extends TabModelSelectorTabObserver
                 ReaderModeTabInfo tabInfo = mTabStatusMap.get(readerTabId);
                 if (tabInfo == null) return;
 
-                tabInfo.setUrl(validatedUrl);
-                if (DomDistillerUrlUtils.isDistilledPage(validatedUrl)) {
+                tabInfo.setUrl(url);
+                if (DomDistillerUrlUtils.isDistilledPage(url)) {
                     tabInfo.setStatus(STARTED);
-                    mReaderModePageUrl = validatedUrl;
+                    mReaderModePageUrl = url;
                 }
             }
 
             @Override
-            public void didNavigateMainFrame(String url, String baseUrl,
-                    boolean isNavigationToDifferentPage, boolean isNavigationInPage,
-                    int statusCode) {
+            public void didFinishNavigation(String url, boolean isInMainFrame, boolean isErrorPage,
+                    boolean hasCommitted, boolean isSamePage, boolean isFragmentNavigation,
+                    Integer pageTransition, int errorCode, int httpStatusCode) {
                 // TODO(cjhopman): This should possibly ignore navigations that replace the entry
                 // (like those from history.replaceState()).
-                if (isNavigationInPage) return;
+                if (!hasCommitted || isSamePage) return;
                 if (DomDistillerUrlUtils.isDistilledPage(url)) return;
 
                 // Make sure the tab was not destroyed.
@@ -474,9 +473,8 @@ public class ReaderModeManager extends TabModelSelectorTabObserver
                 if (tabInfo == null) return;
 
                 tabInfo.setStatus(POSSIBLE);
-                if (!TextUtils.equals(url,
-                        DomDistillerUrlUtils.getOriginalUrlFromDistillerUrl(
-                                mReaderModePageUrl))) {
+                if (!TextUtils.equals(url, DomDistillerUrlUtils.getOriginalUrlFromDistillerUrl(

[Ted C, 2017/01/31 18:57:47]

try to not mix style changes with code changes...will make blame harder to
reason about.

[shaktisahu, 2017/02/03 06:56:16]

Done. 
It was unexpected, due to git cl format.

+                                                   mReaderModePageUrl))) {
                     tabInfo.setStatus(NOT_POSSIBLE);
                     mIsUmaRecorded = false;
                 }