android: Stricter android-app:// referrer handling.

chrome/android/javatests/src/org/chromium/chrome/browser/IntentHandlerTest.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;
 
 import android.content.Context;
 import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
@@ skipping 212 matching lines @@
     public void testRefererUrl_extraReferrer() throws Throwable {
         mUiThreadTestRule.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 // Check that EXTRA_REFERRER is not accepted with a random URL.
                 Intent foreignIntent = new Intent(Intent.ACTION_VIEW);
                 foreignIntent.putExtra(Intent.EXTRA_REFERRER, GOOGLE_URL);
                 Assert.assertNull(IntentHandler.getReferrerUrlIncludingExtraHeaders(foreignIntent));
 
                 // Check that EXTRA_REFERRER with android-app URL works.
-                final String appUrl = "android-app://com.application/http/www.application.com";
+                String appUrl = "android-app://com.application/http/www.application.com";
                 Intent appIntent = new Intent(Intent.ACTION_VIEW);
                 appIntent.putExtra(Intent.EXTRA_REFERRER, Uri.parse(appUrl));
                 Assert.assertEquals(
                         appUrl, IntentHandler.getReferrerUrlIncludingExtraHeaders(appIntent));
 
-                // Check that EXTRA_REFERRER_NAME with android-app works.
+                // Ditto, with EXTRA_REFERRER_NAME.
                 Intent nameIntent = new Intent(Intent.ACTION_VIEW);
                 nameIntent.putExtra(Intent.EXTRA_REFERRER_NAME, appUrl);
                 Assert.assertEquals(
                         appUrl, IntentHandler.getReferrerUrlIncludingExtraHeaders(nameIntent));
+
+                // Check that EXTRA_REFERRER with an empty host android-app URL doesn't work.
+                appUrl = "android-app:///www.application.com";
+                appIntent = new Intent(Intent.ACTION_VIEW);
+                appIntent.putExtra(Intent.EXTRA_REFERRER, Uri.parse(appUrl));
+                Assert.assertNull(IntentHandler.getReferrerUrlIncludingExtraHeaders(appIntent));
+
+                // Ditto, with EXTRA_REFERRER_NAME.
+                nameIntent = new Intent(Intent.ACTION_VIEW);
+                nameIntent.putExtra(Intent.EXTRA_REFERRER_NAME, appUrl);
+                Assert.assertNull(IntentHandler.getReferrerUrlIncludingExtraHeaders(nameIntent));
             }
         });
     }
 
     @Test
     @SmallTest
     @Feature({"Android-AppBase"})
     public void testRefererUrl_extraHeadersInclReferer() throws Throwable {
         mUiThreadTestRule.runOnUiThread(new Runnable() {
             @Override
@@ skipping 109 matching lines @@
     @Test
     @SmallTest
     @Feature({"Android-AppBase"})
     public void testGeneratedReferrer() {
         Context context = InstrumentationRegistry.getInstrumentation().getTargetContext();
         String packageName = context.getPackageName();
         String referrer = IntentHandler.constructValidReferrerForAuthority(packageName).getUrl();
         Assert.assertEquals("android-app://" + packageName, referrer);
     }
 }