Use fallback URL more extensively

chrome/android/javatests/src/org/chromium/chrome/browser/tab/TabRedirectHandlerTest.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.Intent;
 import android.content.pm.ActivityInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
@@ skipping 240 matching lines @@
         SystemClock.sleep(1);
         handler.updateNewUrlLoading(PageTransition.LINK, false, SystemClock.elapsedRealtime(), 2);
         assertFalse(handler.shouldStayInChrome());
 
         assertTrue(handler.isOnNavigation());
         assertEquals(2, handler.getLastCommittedEntryIndexBeforeStartingNavigation());
     }
 
     @SmallTest
     @Feature({"IntentHandling"})
-    public void testRedirectFromCurrentNavigationShouldStayInChrome() {
+    public void testRedirectFromCurrentNavigationShouldNotOverrideUrlLoading() {
         /////////////////////////////////////////////////////
-        // 1. 3XX redirection should stay in Chrome.
+        // 1. 3XX redirection should not override URL loading.
         /////////////////////////////////////////////////////
         TabRedirectHandler handler = new TabRedirectHandler(mContext);
         handler.updateIntent(sYtIntent);
-        assertFalse(handler.shouldStayInChrome());
+        assertFalse(handler.shouldNotOverrideUrlLoading());
 
         handler.updateNewUrlLoading(PageTransition.LINK, false, 0, 0);
-        handler.setShouldStayInChromeUntilNewUrlLoading();
+        handler.setShouldNotOverrideUrlLoadingUntilNewUrlLoading();
 
         handler.updateNewUrlLoading(PageTransition.LINK, true, 0, 0);
-        assertTrue(handler.shouldStayInChrome());
+        assertTrue(handler.shouldNotOverrideUrlLoading());
         assertEquals(0, handler.getLastCommittedEntryIndexBeforeStartingNavigation());
 
         /////////////////////////////////////////////////////
-        // 2. Effective redirection should stay in Chrome.
+        // 2. Effective redirection should not override URL loading.
         /////////////////////////////////////////////////////
         handler = new TabRedirectHandler(mContext);
         handler.updateIntent(sYtIntent);
-        assertFalse(handler.shouldStayInChrome());
+        assertFalse(handler.shouldNotOverrideUrlLoading());
 
         handler.updateNewUrlLoading(PageTransition.LINK, false, 0, 0);
-        handler.setShouldStayInChromeUntilNewUrlLoading();
+        handler.setShouldNotOverrideUrlLoadingUntilNewUrlLoading();
 
-        // Effective redirection should stay in Chrome.
+        // Effective redirection occurred.
         handler.updateNewUrlLoading(PageTransition.LINK, false, 0, 1);
-        assertTrue(handler.shouldStayInChrome());
+        assertTrue(handler.shouldNotOverrideUrlLoading());
         assertEquals(0, handler.getLastCommittedEntryIndexBeforeStartingNavigation());
 
         /////////////////////////////////////////////////////
         // 3. New URL loading should not be affected.
         /////////////////////////////////////////////////////
         SystemClock.sleep(1);
         handler.updateNewUrlLoading(PageTransition.LINK, false, SystemClock.elapsedRealtime(), 2);
-        assertFalse(handler.shouldStayInChrome());
+        assertFalse(handler.shouldNotOverrideUrlLoading());
         assertEquals(2, handler.getLastCommittedEntryIndexBeforeStartingNavigation());
     }
 
     private static class TestPackageManager extends MockPackageManager {
         @Override
         public List<ResolveInfo> queryIntentActivities(Intent intent, int flags) {
             List<ResolveInfo> resolves = new ArrayList<ResolveInfo>();
             if (intent.getDataString().startsWith("http://m.youtube.com")
                     ||  intent.getDataString().startsWith("http://youtube.com")) {
                 ResolveInfo youTubeApp = new ResolveInfo();
@@ skipping 18 matching lines @@
             return new TestPackageManager();
         }
 
         @Override
         public String getPackageName() {
             return TEST_PACKAGE_NAME;
         }
 
     }
 }