Expose FormatUrlForSecurityDisplay to Java on Android.

chrome/android/javatests/src/org/chromium/chrome/browser/UrlUtilitiesTest.java

 // Copyright 2013 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.test.InstrumentationTestCase;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.Feature;
+import org.chromium.content.browser.test.NativeLibraryTestBase;
 
 import java.net.URI;
 
-public class UrlUtilitiesTest extends InstrumentationTestCase {
+public class UrlUtilitiesTest extends NativeLibraryTestBase {
     @SmallTest
     public void testIsAcceptedScheme() {
         assertTrue(UrlUtilities.isAcceptedScheme("about:awesome"));
         assertTrue(UrlUtilities.isAcceptedScheme("data:data"));
         assertTrue(UrlUtilities.isAcceptedScheme(
                 "https://user:pass@:awesome.com:9000/bad-scheme:#fake:"));
         assertTrue(UrlUtilities.isAcceptedScheme("http://awesome.example.com/"));
         assertTrue(UrlUtilities.isAcceptedScheme("file://awesome.example.com/"));
         assertTrue(UrlUtilities.isAcceptedScheme("inline:skates.co.uk"));
         assertTrue(UrlUtilities.isAcceptedScheme("javascript:alert(1)"));
@@ skipping 41 matching lines @@
         assertTrue(UrlUtilities.isValidForIntentFallbackNavigation(
                 "https://user:pass@:awesome.com:9000/bad-scheme:#fake:"));
         assertTrue(UrlUtilities.isValidForIntentFallbackNavigation("http://awesome.example.com/"));
         assertFalse(UrlUtilities.isValidForIntentFallbackNavigation("inline:skates.co.uk"));
         assertFalse(UrlUtilities.isValidForIntentFallbackNavigation("javascript:alert(1)"));
         assertFalse(UrlUtilities.isValidForIntentFallbackNavigation(""));
     }
 
     @SmallTest
     @Feature({"Webapps"})
-    public void testGetOriginForDisplay() {
+    public void testFormatUrlForSecurityDisplay() {
+        loadNativeLibraryNoBrowserProcess();
+
         URI uri;
 
         uri = URI.create("http://chopped.com/is/awesome");
-        assertEquals("http://chopped.com", UrlUtilities.getOriginForDisplay(uri, true));
-        assertEquals("chopped.com", UrlUtilities.getOriginForDisplay(uri, false));
+        assertEquals("http://chopped.com", UrlUtilities.formatUrlForSecurityDisplay(uri, true));
+        assertEquals("chopped.com", UrlUtilities.formatUrlForSecurityDisplay(uri, false));
 
         uri = URI.create("http://lopped.com");
-        assertEquals("http://lopped.com", UrlUtilities.getOriginForDisplay(uri, true));
-        assertEquals("lopped.com", UrlUtilities.getOriginForDisplay(uri, false));
+        assertEquals("http://lopped.com", UrlUtilities.formatUrlForSecurityDisplay(uri, true));
+        assertEquals("lopped.com", UrlUtilities.formatUrlForSecurityDisplay(uri, false));
 
         uri = URI.create("http://dropped.com?things");
-        assertEquals("http://dropped.com", UrlUtilities.getOriginForDisplay(uri, true));
-        assertEquals("dropped.com", UrlUtilities.getOriginForDisplay(uri, false));
+        assertEquals("http://dropped.com", UrlUtilities.formatUrlForSecurityDisplay(uri, true));
+        assertEquals("dropped.com", UrlUtilities.formatUrlForSecurityDisplay(uri, false));
 
         uri = URI.create("http://dfalcant@stopped.com:1234");
-        assertEquals("http://stopped.com:1234", UrlUtilities.getOriginForDisplay(uri, true));
-        assertEquals("stopped.com:1234", UrlUtilities.getOriginForDisplay(uri, false));
+        assertEquals(
+                "http://stopped.com:1234", UrlUtilities.formatUrlForSecurityDisplay(uri, true));
+        assertEquals("stopped.com:1234", UrlUtilities.formatUrlForSecurityDisplay(uri, false));
 
         uri = URI.create("http://dfalcant:secret@stopped.com:9999");
-        assertEquals("http://stopped.com:9999", UrlUtilities.getOriginForDisplay(uri, true));
-        assertEquals("stopped.com:9999", UrlUtilities.getOriginForDisplay(uri, false));
+        assertEquals(
+                "http://stopped.com:9999", UrlUtilities.formatUrlForSecurityDisplay(uri, true));
+        assertEquals("stopped.com:9999", UrlUtilities.formatUrlForSecurityDisplay(uri, false));
 
         uri = URI.create("chrome://settings:443");
-        assertEquals("chrome://settings:443", UrlUtilities.getOriginForDisplay(uri, true));
-        assertEquals("settings:443", UrlUtilities.getOriginForDisplay(uri, false));
+        assertEquals("chrome://settings:443", UrlUtilities.formatUrlForSecurityDisplay(uri, true));
+        assertEquals("chrome://settings:443", UrlUtilities.formatUrlForSecurityDisplay(uri, false));
 
         uri = URI.create("about:blank");
-        assertEquals("about:blank", UrlUtilities.getOriginForDisplay(uri, true));
-        assertEquals("about:blank", UrlUtilities.getOriginForDisplay(uri, false));
+        assertEquals("about:blank", UrlUtilities.formatUrlForSecurityDisplay(uri, true));
+        assertEquals("about:blank", UrlUtilities.formatUrlForSecurityDisplay(uri, false));
     }
 
     @SmallTest
     public void testValidateIntentUrl() {
         // Valid action, hostname, and (empty) path.
         assertTrue(UrlUtilities.validateIntentUrl(
                 "intent://10010#Intent;scheme=tel;action=com.google.android.apps."
                 + "authenticator.AUTHENTICATE;end"));
         // Valid package, scheme, hostname, and path.
         assertTrue(UrlUtilities.validateIntentUrl(
@@ skipping 51 matching lines @@
                 "intent://wump-hey.example.com/#Intent;package=com.example.wump;"
                 + "category=42%_by_volume;end"));
         // Incorrectly URL-encoded.
         assertFalse(UrlUtilities.validateIntentUrl(
                 "intent://testing/#Intent;package=cybergoat.noodle.crumpet;"
                 + "component=wump.noodle/Crumpet;i.pumpkinCount%%3D=42;"
                 + "S.goat=⋚end"));
     }
 
 }