Use fallback URL more extensively

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

Index: chrome/android/java/src/org/chromium/chrome/browser/tab/TabRedirectHandler.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabRedirectHandler.java b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabRedirectHandler.java
index 2c8ea392131d20edbaec06f36c58bae1d740376e..186117c3fe3ce7f3db0b0e2d584ad8c09f6f26b8 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/tab/TabRedirectHandler.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/tab/TabRedirectHandler.java
@@ -41,7 +41,7 @@ public class TabRedirectHandler {
     private int mInitialNavigationType;
     private int mLastCommittedEntryIndexBeforeStartingNavigation;
 
-    private boolean mShouldStayInChromeUntilNewUrlLoading;
+    private boolean mShouldNotOverrideUrlLoadingUntilNewUrlLoading;
 
     private final Context mContext;
 
@@ -96,11 +96,11 @@ public class TabRedirectHandler {
         mInitialNavigationType = NAVIGATION_TYPE_NONE;
         mIsOnEffectiveRedirectChain = false;
         mLastCommittedEntryIndexBeforeStartingNavigation = 0;
-        mShouldStayInChromeUntilNewUrlLoading = false;
+        mShouldNotOverrideUrlLoadingUntilNewUrlLoading = false;
     }
 
-    public void setShouldStayInChromeUntilNewUrlLoading() {
-        mShouldStayInChromeUntilNewUrlLoading = true;
+    public void setShouldNotOverrideUrlLoadingUntilNewUrlLoading() {
+        mShouldNotOverrideUrlLoadingUntilNewUrlLoading = true;
     }
 
     /**
@@ -154,7 +154,7 @@ public class TabRedirectHandler {
                 clearIntentHistory();
             }
             mLastCommittedEntryIndexBeforeStartingNavigation = lastCommittedEntryIndex;
-            mShouldStayInChromeUntilNewUrlLoading = false;
+            mShouldNotOverrideUrlLoadingUntilNewUrlLoading = false;
         } else if (mInitialNavigationType != NAVIGATION_TYPE_NONE) {
             // Redirect chain starts from the second url loading.
             mIsOnEffectiveRedirectChain = true;
@@ -169,12 +169,18 @@ public class TabRedirectHandler {
     }
 
     /**
-     * @return whether we should stay in Chrome or not.
+     * @return whether we should stay in Chrome or not. There are two different
      */
     public boolean shouldStayInChrome() {
         return mIsInitialIntentHeadingToChrome
-                || mInitialNavigationType == NAVIGATION_TYPE_FROM_USER_TYPING
-                || mShouldStayInChromeUntilNewUrlLoading;
+                || mInitialNavigationType == NAVIGATION_TYPE_FROM_USER_TYPING;
+    }
+
+    /**
+     * @return whether we should stay in Chrome or not.
+     */
+    public boolean shouldNotOverrideUrlLoading() {
+        return mShouldNotOverrideUrlLoadingUntilNewUrlLoading;
     }
 
     /**