Correct location bar behavior on load fail

chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java

Index: chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
index e41fd281fdd18c848557091dda0ea3c03bb86a93..3f17afddb49626ba22bd73308aa453b425614c33 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/toolbar/ToolbarManager.java
@@ -416,9 +416,16 @@ public class ToolbarManager implements ToolbarTabController, UrlFocusChangeListe
                     int errorCode, String description, String failingUrl) {
                 NewTabPage ntp = mToolbarModel.getNewTabPageForCurrentTab();
                 if (ntp == null) return;
-                if (isProvisionalLoad && isMainFrame) {
+
+                // If the load failed due to a different navigation, there is no need to reset the
+                // the location bar animations.
+                boolean isFailingToNtp = tab.getWebContents() != null

[Ted C, 2016/08/02 20:55:18]

Hmm...I'm a bit confused what this is checking for.

Is the problem something like:

1.) You're on the NTP
2.) You tap a most visited item <foo.com>, navigation happens to foo.com
3.) You tap another most visited item, navigation in #2 is failed, new
navigation to foo.com is started

Wondering if #3 is right.

I'm wondering if the visible URL is the best indicator.  Or whether we should
look for a pending navigation.

isFailingToNtp also is a bit confusing to me/hard to grok.  My thinking about
pending navigations would be moving towards naming this hasPendingNavigation or
something as that is clearer where we wouldn't reset the state if there was a
pending navigation.  No idea if we can figure this out at this point though.

+                        && tab.getWebContents().getVisibleUrl().equals(UrlConstants.NTP_URL);
+
+                if (isProvisionalLoad && isMainFrame && isFailingToNtp) {
                     ntp.setUrlFocusAnimationsDisabled(false);
                     mToolbar.onTabOrModelChanged();
+                    if (mToolbar.getProgressBar() != null) mToolbar.getProgressBar().finish(false);
                 }
             }