Use fallback URL more extensively

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

 // Copyright 2015 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.tab;
 
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.os.SystemClock;
@@ skipping 23 matching lines @@
     private Intent mInitialIntent;
     // A resolver list which includes all resolvers of |mInitialIntent|.
     private final HashSet<ComponentName> mCachedResolvers = new HashSet<ComponentName>();
     private boolean mIsInitialIntentHeadingToChrome;
 
     private long mLastNewUrlLoadingTime;
     private boolean mIsOnEffectiveRedirectChain;
     private int mInitialNavigationType;
     private int mLastCommittedEntryIndexBeforeStartingNavigation;
 
-    private boolean mShouldStayInChromeUntilNewUrlLoading;
+    private boolean mShouldNotOverrideUrlLoadingUntilNewUrlLoading;
 
     private final Context mContext;
 
     public TabRedirectHandler(Context context) {
         mContext = context;
     }
 
     /**
      * Updates |mIntentHistory| and |mLastIntentUpdatedTime|. If |intent| comes from chrome and
      * currently |mIsOnEffectiveIntentRedirectChain| is true, that means |intent| was sent from
@@ skipping 34 matching lines @@
     }
 
     /**
      * Resets all variables except timestamps.
      */
     public void clear() {
         clearIntentHistory();
         mInitialNavigationType = NAVIGATION_TYPE_NONE;
         mIsOnEffectiveRedirectChain = false;
         mLastCommittedEntryIndexBeforeStartingNavigation = 0;
-        mShouldStayInChromeUntilNewUrlLoading = false;
+        mShouldNotOverrideUrlLoadingUntilNewUrlLoading = false;
     }
 
-    public void setShouldStayInChromeUntilNewUrlLoading() {
-        mShouldStayInChromeUntilNewUrlLoading = true;
+    public void setShouldNotOverrideUrlLoadingUntilNewUrlLoading() {
+        mShouldNotOverrideUrlLoadingUntilNewUrlLoading = true;
     }
 
     /**
      * Updates new url loading information to trace navigation.
      * A time based heuristic is used to determine if this loading is an effective redirect or not
      * if core of |pageTransType| is LINK.
      *
      * http://crbug.com/322567 : Trace navigation started from an external app.
      * http://crbug.com/331571 : Trace navigation started from user typing to do not override such
      * navigation.
@@ skipping 33 matching lines @@
             } else if (pageTransitionCore == PageTransition.TYPED) {
                 mInitialNavigationType = NAVIGATION_TYPE_FROM_USER_TYPING;
                 mIsOnEffectiveRedirectChain = false;
                 clearIntentHistory();
             } else {
                 mInitialNavigationType = NAVIGATION_TYPE_OTHER;
                 mIsOnEffectiveRedirectChain = false;
                 clearIntentHistory();
             }
             mLastCommittedEntryIndexBeforeStartingNavigation = lastCommittedEntryIndex;
-            mShouldStayInChromeUntilNewUrlLoading = false;
+            mShouldNotOverrideUrlLoadingUntilNewUrlLoading = false;
         } else if (mInitialNavigationType != NAVIGATION_TYPE_NONE) {
             // Redirect chain starts from the second url loading.
             mIsOnEffectiveRedirectChain = true;
         }
     }
 
     /**
      * @return whether on effective intent redirect chain or not.
      */
     public boolean isOnEffectiveIntentRedirectChain() {
         return mInitialNavigationType == NAVIGATION_TYPE_FROM_INTENT && mIsOnEffectiveRedirectChain;
     }
 
     /**
+     * @return whether we should stay in Chrome or not. There are two different
+     */
+    public boolean shouldStayInChrome() {
+        return mIsInitialIntentHeadingToChrome
+                || mInitialNavigationType == NAVIGATION_TYPE_FROM_USER_TYPING;
+    }
+
+    /**
      * @return whether we should stay in Chrome or not.
      */
-    public boolean shouldStayInChrome() {
-        return mIsInitialIntentHeadingToChrome
-                || mInitialNavigationType == NAVIGATION_TYPE_FROM_USER_TYPING
-                || mShouldStayInChromeUntilNewUrlLoading;
+    public boolean shouldNotOverrideUrlLoading() {
+        return mShouldNotOverrideUrlLoadingUntilNewUrlLoading;
     }
 
     /**
      * @return whether on navigation or not.
      */
     public boolean isOnNavigation() {
         return mInitialNavigationType != NAVIGATION_TYPE_NONE;
     }
 
     /**
@@ skipping 18 matching lines @@
             mCachedResolvers.addAll(IntentUtils.getIntentHandlers(mContext, mInitialIntent));
         }
         for (ComponentName name : newList) {
             if (!mCachedResolvers.contains(name)) {
                 return true;
             }
         }
         return false;
     }
 }