Add a separate param for https scheme hightlight to emphasizeUrl

chrome/android/javatests_shell/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java

Index: chrome/android/javatests_shell/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
diff --git a/chrome/android/javatests_shell/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java b/chrome/android/javatests_shell/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
index 0173353c8542f62dacdaf9dc27a95e4ecd0442ef..46a1613b43393ce71293e158f6c2323072805456 100644
--- a/chrome/android/javatests_shell/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
+++ b/chrome/android/javatests_shell/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizerTest.java
@@ -126,7 +126,7 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
     public void testShortSecureHTTPSUrl() {
         Spannable url = new SpannableStringBuilder("https://www.google.com/");
         OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
-                ConnectionSecurityHelperSecurityLevel.SECURE, false, true);
+                ConnectionSecurityHelperSecurityLevel.SECURE, false, true, true);
         EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
 
         assertEquals("Unexpected number of spans:", 4, spans.length);
@@ -150,7 +150,7 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
     public void testShortSecureHTTPSUrlWithLightColors() {
         Spannable url = new SpannableStringBuilder("https://www.google.com/");
         OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
-                ConnectionSecurityHelperSecurityLevel.SECURE, false, false);
+                ConnectionSecurityHelperSecurityLevel.SECURE, false, false, false);
         EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
 
         assertEquals("Unexpected number of spans:", 4, spans.length);
@@ -175,7 +175,7 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
         Spannable url = new SpannableStringBuilder(
                 "https://www.google.com/q?query=abc123&results=1");
         OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
-                ConnectionSecurityHelperSecurityLevel.SECURITY_ERROR, false, true);
+                ConnectionSecurityHelperSecurityLevel.SECURITY_ERROR, false, true, true);
         EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
 
         assertEquals("Unexpected number of spans:", 5, spans.length);
@@ -200,7 +200,7 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
     public void testVeryShortWarningHTTPSUrl() {
         Spannable url = new SpannableStringBuilder("https://www.dodgysite.com");
         OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
-                ConnectionSecurityHelperSecurityLevel.SECURITY_WARNING, false, true);
+                ConnectionSecurityHelperSecurityLevel.SECURITY_WARNING, false, true, true);
         EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
 
         assertEquals("Unexpected number of spans:", 3, spans.length);
@@ -221,8 +221,8 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
     @Feature({"Browser", "Main"})
     public void testAboutPageUrl() {
         Spannable url = new SpannableStringBuilder("about:blank");
-        OmniboxUrlEmphasizer.emphasizeUrl(
-                url, mResources, mProfile, ConnectionSecurityHelperSecurityLevel.NONE, true, true);
+        OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
+                ConnectionSecurityHelperSecurityLevel.NONE, true, true, true);
         EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
 
         assertEquals("Unexpected number of spans:", 3, spans.length);
@@ -244,8 +244,8 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
     public void testDataUrl() {
         Spannable url = new SpannableStringBuilder(
                 "data:text/plain;charset=utf-8;base64,VGVzdCBVUkw=");
-        OmniboxUrlEmphasizer.emphasizeUrl(
-                url, mResources, mProfile, ConnectionSecurityHelperSecurityLevel.NONE, true, true);
+        OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
+                ConnectionSecurityHelperSecurityLevel.NONE, true, true, true);
         EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
 
         assertEquals("Unexpected number of spans:", 1, spans.length);
@@ -262,8 +262,8 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
     @Feature({"Browser", "Main"})
     public void testInternalChromePageUrl() {
         Spannable url = new SpannableStringBuilder("chrome://bookmarks");
-        OmniboxUrlEmphasizer.emphasizeUrl(
-                url, mResources, mProfile, ConnectionSecurityHelperSecurityLevel.NONE, true, true);
+        OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
+                ConnectionSecurityHelperSecurityLevel.NONE, true, true, true);
         EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
 
         assertEquals("Unexpected number of spans:", 3, spans.length);
@@ -284,8 +284,8 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
     @Feature({"Browser", "Main"})
     public void testInternalChromeNativePageUrl() {
         Spannable url = new SpannableStringBuilder("chrome-native://bookmarks");
-        OmniboxUrlEmphasizer.emphasizeUrl(
-                url, mResources, mProfile, ConnectionSecurityHelperSecurityLevel.NONE, true, true);
+        OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
+                ConnectionSecurityHelperSecurityLevel.NONE, true, true, true);
         EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
 
         assertEquals("Unexpected number of spans:", 3, spans.length);
@@ -306,8 +306,8 @@ public class OmniboxUrlEmphasizerTest extends ChromeShellTestBase {
     @Feature({"Browser", "Main"})
     public void testInvalidUrl() {
         Spannable url = new SpannableStringBuilder("invalidurl");
-        OmniboxUrlEmphasizer.emphasizeUrl(
-                url, mResources, mProfile, ConnectionSecurityHelperSecurityLevel.NONE, true, true);
+        OmniboxUrlEmphasizer.emphasizeUrl(url, mResources, mProfile,
+                ConnectionSecurityHelperSecurityLevel.NONE, true, true, true);
         EmphasizedUrlSpanHelper[] spans = EmphasizedUrlSpanHelper.getSpansForEmphasizedUrl(url);
 
         assertEquals("Unexpected number of spans:", 1, spans.length);