Fix security icon colors on light themes

Security icon colors on Chrome for Android and Chrome Custom Tabs should
be as follows:

1. Default toolbar color => green lock/red triangle
2. Dark toolbar color => white icons
3. Light toolbar color with opaque omnibox => green/red
4. Other toolbar color with transparent omnibox => dark icons

#1 and #2 were already working properly; this CL implements #3 and #4.

BUG=633736
TEST=On Chrome for Android, visit the following URLs and observe the
given security icon colors:
1. https://google.com => green lock
2. https://yahoo.com => white lock
3. https://just-skyline-137219.appspot.com/lightblue => opaque omnibox
with green lock
4. https://garron.net/test/theme-color/?color=%2300ffff => transparent
omnibox with dark lock
In a CCT client app, set the toolbar color to the following colors and then visit https://www.google.com:
1. Default => green lock
2. #ef6c00 => white lock
3. #ffffcc => dark lock
4. #66ffff => dark lock

Review-Url: https://codereview.chromium.org/2274973004
Cr-Commit-Position: refs/heads/master@{#414897}

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

@@ -1226,16 +1226,24 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener,
      * @param securityLevel The security level for which the color will be returned.
      * @param provider The {@link ToolbarDataProvider}.
      * @param resources The Resources for the Context.
+     * @param isOmniboxOpaque Whether the omnibox is an opaque color.
      * @return The {@link ColorStateList} to use to tint the security state icon.
      */
-    public static ColorStateList getColorStateList(
-            int securityLevel, ToolbarDataProvider provider, Resources resources) {
+    public static ColorStateList getColorStateList(int securityLevel, ToolbarDataProvider provider,
+            Resources resources, boolean isOmniboxOpaque) {
         ColorStateList list = null;
         int color = provider.getPrimaryColor();
         boolean needLightIcon = ColorUtils.shouldUseLightForegroundOnBackground(color);
         if (provider.isIncognito() || needLightIcon) {
+            // For a dark theme color, use light icons.
             list = ApiCompatibilityUtils.getColorStateList(resources, R.color.light_mode_tint);
+        } else if (!ColorUtils.isUsingDefaultToolbarColor(resources, color) && !isOmniboxOpaque) {
+            // For theme colors which are not dark and are also not
+            // light enough to warrant an opaque URL bar, use dark
+            // icons.
+            list = ApiCompatibilityUtils.getColorStateList(resources, R.color.dark_mode_tint);
         } else {
+            // For the default toolbar color, use a green or red icon.
             if (securityLevel == ConnectionSecurityLevel.SECURITY_ERROR) {
                 list = ApiCompatibilityUtils.getColorStateList(resources, R.color.google_red_700);
             } else if (securityLevel == ConnectionSecurityLevel.SECURE
@@ -1261,8 +1269,9 @@ public class LocationBarLayout extends FrameLayout implements OnClickListener,
         } else {
             // ImageView#setImageResource is no-op if given resource is the current one.
             mSecurityButton.setImageResource(id);
-            mSecurityButton.setTint(
-                    getColorStateList(securityLevel, getToolbarDataProvider(), getResources()));
+            mSecurityButton.setTint(getColorStateList(securityLevel, getToolbarDataProvider(),
+                    getResources(), ColorUtils.shouldUseOpaqueTextboxBackground(
+                            getToolbarDataProvider().getPrimaryColor())));
         }
 
         boolean shouldEmphasizeHttpsScheme = shouldEmphasizeHttpsScheme();

chrome/android/java/src/org/chromium/chrome/browser/toolbar/CustomTabToolbar.java

@@ -507,8 +507,9 @@ public class CustomTabToolbar extends ToolbarLayout implements LocationBar,
             } else {
                 // ImageView#setImageResource is no-op if given resource is the current one.
                 mSecurityButton.setImageResource(id);
-                mSecurityButton.setTint(LocationBarLayout.getColorStateList(
-                        securityLevel, getToolbarDataProvider(), getResources()));
+                mSecurityButton.setTint(
+                        LocationBarLayout.getColorStateList(securityLevel, getToolbarDataProvider(),
+                                getResources(), false /* omnibox is not opaque */));
             }
             mAnimDelegate.showSecurityButton();
         }