Add a separate param for https scheme hightlight to emphasizeUrl

chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java

Index: chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java
index 9cf8e6994d931bd1532ec33fba9c7fb8d0286d7e..cfbffe0afc1d7ac12f95ca24f4e9d3b79d071ef6 100644
--- a/chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java
+++ b/chrome/android/java/src/org/chromium/chrome/browser/omnibox/OmniboxUrlEmphasizer.java
@@ -140,9 +140,15 @@ public class OmniboxUrlEmphasizer {
      * @param isInternalPage Whether this page is an internal Chrome page.
      * @param useDarkColors Whether the text colors should be dark (i.e.
      *                      appropriate for use on a light background).
+     * @param emphasizeHttpsScheme Whether the https scheme should be emphasized.
      */
     public static void emphasizeUrl(Spannable url, Resources resources, Profile profile,
-            int securityLevel, boolean isInternalPage, boolean useDarkColors) {
+            int securityLevel, boolean isInternalPage,
+            boolean useDarkColors, boolean emphasizeHttpsScheme) {
+        assert (securityLevel == ConnectionSecurityHelperSecurityLevel.SECURITY_ERROR
+                || securityLevel == ConnectionSecurityHelperSecurityLevel.SECURITY_WARNING)
+                ? emphasizeHttpsScheme : true;
+
         String urlString = url.toString();
 
         EmphasizeComponentsResponse emphasizeResponse =
@@ -163,10 +169,7 @@ public class OmniboxUrlEmphasizer {
         ForegroundColorSpan span;
         if (emphasizeResponse.hasScheme()) {
             int colorId = nonEmphasizedColorId;
-            if (!isInternalPage
-                    && (useDarkColors
-                               || securityLevel
-                                       == ConnectionSecurityHelperSecurityLevel.SECURITY_ERROR)) {
+            if (!isInternalPage && emphasizeHttpsScheme) {
                 switch (securityLevel) {
                     case ConnectionSecurityHelperSecurityLevel.NONE:
                         colorId = nonEmphasizedColorId;