Use fallback URL more extensively

chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/ExternalNavigationHandlerTest.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.externalnav;
 
 import android.annotation.TargetApi;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ skipping 585 matching lines @@
                 OverrideUrlLoadingResult.OVERRIDE_WITH_EXTERNAL_INTENT,
                 START_ACTIVITY);
 
         Intent invokedIntent = mDelegate.startActivityIntent;
         assertTrue(invokedIntent.getData().toString().startsWith("market://"));
         assertEquals(null, mDelegate.getNewUrlAfterClobbering());
         assertEquals(null, mDelegate.getReferrerUrlForClobbering());
     }
 
     @SmallTest
+    public void testFallback_UseFallbackUrlForRedirectionFromTypedInUrl() {
+        TabRedirectHandler redirectHandler = new TabRedirectHandler(null);
+
+        redirectHandler.updateNewUrlLoading(PageTransition.TYPED, false, 0, 0);
+        check("http://goo.gl/abcdefg", null, /* referrer */
+                false, /* incognito */
+                PageTransition.TYPED, NO_REDIRECT, true, false, redirectHandler,
+                OverrideUrlLoadingResult.NO_OVERRIDE, IGNORE);
+
+        redirectHandler.updateNewUrlLoading(PageTransition.TYPED, true, 0, 0);
+        check(INTENT_URL_WITH_FALLBACK_URL_WITHOUT_PACKAGE_NAME, null, /* referrer */
+                false, /* incognito */
+                PageTransition.TYPED, REDIRECT, true, false, redirectHandler,
+                OverrideUrlLoadingResult.OVERRIDE_WITH_CLOBBERING_TAB, IGNORE);
+
+        // Now the user opens a link.
+        redirectHandler.updateNewUrlLoading(PageTransition.LINK, false, 0, 1);
+        check("http://m.youtube.com/", null, /* referrer */
+                false, /* incognito */
+                PageTransition.LINK, NO_REDIRECT, true, false, redirectHandler,
+                OverrideUrlLoadingResult.NO_OVERRIDE, IGNORE);
+    }
+
+    @SmallTest
     public void testIgnoreEffectiveRedirectFromIntentFallbackUrl() {
         // We cannot resolve any intent, so fall-back URL will be used.
         mDelegate.setCanResolveActivity(false);
 
         TabRedirectHandler redirectHandler = new TabRedirectHandler(null);
 
         redirectHandler.updateNewUrlLoading(PageTransition.LINK, false, 0, 0);
         check(INTENT_URL_WITH_CHAIN_FALLBACK_URL,
                 null, /* referrer */
                 false, /* incognito */
@@ skipping 371 matching lines @@
             return new TestPackageManager();
         }
 
         @Override
         public String getPackageName() {
             return "test.app.name";
         }
 
     }
 }