Use dark theme colors for some dse status view icons

The following icons should be colored according to the current theme:
- search loupe
- globe

I've changed the functionality from setting properties in the model to
setting the resource values intermediate variables (icon/tint) and
settings those in the model at the end of the branch. This simplifies
the code a bit and makes it easier to read. To allow for this change,
I've altered the favicon fetching logic to post a task back to the
ui thread for the callback. This way the callback isn't invoked
immediately, which avoids crbug.com/997343 from resurfacing due to
this change.

Bug: 1004903
Change-Id: I6e8102f47e81d0037761d9b111b98d4f1999a225
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1818604
Commit-Queue: Brandon Wylie <wylieb@chromium.org>
Reviewed-by: Theresa  <twellington@chromium.org>
Reviewed-by: Ender <ender@google.com>
Cr-Commit-Position: refs/heads/master@{#699992}

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

@@ -15,6 +15,8 @@ import androidx.annotation.Nullable;
 import org.chromium.base.Callback;
 import org.chromium.base.VisibleForTesting;
 import org.chromium.base.library_loader.LibraryProcessType;
+import org.chromium.base.task.PostTask;
+import org.chromium.base.task.TaskTraits;
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeFeatureList;
 import org.chromium.chrome.browser.favicon.FaviconHelper;
@@ -24,6 +26,7 @@ import org.chromium.chrome.browser.search_engines.TemplateUrlServiceFactory;
 import org.chromium.chrome.browser.util.UrlUtilities;
 import org.chromium.chrome.browser.widget.RoundedIconGenerator;
 import org.chromium.content_public.browser.BrowserStartupController;
+import org.chromium.content_public.browser.UiThreadTaskTraits;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -167,18 +170,25 @@ public class SearchEngineLogoUtils {
      */
     public static void getSearchEngineLogoFavicon(
             Profile profile, Resources resources, Callback<Bitmap> callback) {
+        PostTask.postTask(TaskTraits.USER_VISIBLE,
+                () -> getSearchEngineLogoFaviconInternal(profile, resources, callback));
+    }
+
+    /** @see {@link #getSearchEngineLogoFavicon}. */
+    private static void getSearchEngineLogoFaviconInternal(
+            Profile profile, Resources resources, Callback<Bitmap> callback) {
         if (sFaviconHelper == null) sFaviconHelper = new FaviconHelper();
 
         String logoUrl = getSearchLogoUrl();
         if (logoUrl == null) {
-            callback.onResult(null);
+            returnLogoOnUiThread(null, callback);
             return;
         }
 
         // Return a cached copy if it's available.
         if (sCachedComposedBackground != null
                 && sCachedComposedBackgroundLogoUrl.equals(getSearchLogoUrl())) {
-            callback.onResult(sCachedComposedBackground);
+            returnLogoOnUiThread(sCachedComposedBackground, callback);
             return;
         }
 
@@ -186,13 +196,15 @@ public class SearchEngineLogoUtils {
         boolean willReturn = sFaviconHelper.getLocalFaviconImageForURL(
                 profile, logoUrl, logoSizePixels, (image, iconUrl) -> {
                     if (image == null) {
-                        callback.onResult(image);
+                        returnLogoOnUiThread(image, callback);
                         return;
                     }
 
                     processReturnedLogo(logoUrl, image, resources, callback);
                 });
-        if (!willReturn) callback.onResult(null);
+        if (!willReturn) {
+            returnLogoOnUiThread(null, callback);
+        }
     }
 
     /**
@@ -236,7 +248,15 @@ public class SearchEngineLogoUtils {
         sCachedComposedBackground = composedIcon;
         sCachedComposedBackgroundLogoUrl = logoUrl;
 
-        callback.onResult(sCachedComposedBackground);
+        returnLogoOnUiThread(sCachedComposedBackground, callback);
+    }
+
+    /**
+     * @param logo The logo to return to callback.
+     * @param callback The callback for the calling client.
+     */
+    private static void returnLogoOnUiThread(Bitmap logo, Callback<Bitmap> callback) {
+        PostTask.postTask(UiThreadTaskTraits.USER_VISIBLE, () -> callback.onResult(logo));
     }
 
     /**

chrome/android/java/src/org/chromium/chrome/browser/omnibox/status/StatusMediator.java

@@ -368,6 +368,10 @@ class StatusMediator {
      *     - not shown if URL is focused.
      */
     private void updateLocationBarIcon() {
+        int icon = 0;
+        int tint = 0;
+        int toast = 0;
+
         // Update the accessibility description before continuing since we need it either way.
         mModel.set(StatusProperties.STATUS_ICON_DESCRIPTION_RES, getAccessibilityDescriptionRes());
 
@@ -394,32 +398,31 @@ class StatusMediator {
             mShouldCancelCustomFavicon = false;
             // If the current url text is a valid url, then swap the dse icon for a globe.
             if (mUrlBarTextIsValidUrl) {
-                mModel.set(StatusProperties.STATUS_ICON_RES, R.drawable.ic_globe_24dp);
+                icon = R.drawable.ic_globe_24dp;
             } else if (mIsSearchEngineGoogle) {
-                mModel.set(StatusProperties.STATUS_ICON_RES,
-                        mDelegate.shouldShowSearchLoupeEverywhere(isIncognito)
-                                ? R.drawable.ic_search
-                                : R.drawable.ic_logo_googleg_24dp);
+                if (mDelegate.shouldShowSearchLoupeEverywhere(isIncognito)) {
+                    icon = R.drawable.ic_search;
+                } else {
+                    icon = R.drawable.ic_logo_googleg_24dp;
+                }
             } else {
-                mModel.set(StatusProperties.STATUS_ICON_RES, R.drawable.ic_search);
+                icon = R.drawable.ic_search;
                 if (!mDelegate.shouldShowSearchLoupeEverywhere(isIncognito)) {
                     mDelegate.getSearchEngineLogoFavicon(mResources, (favicon) -> {
                         if (favicon == null || mShouldCancelCustomFavicon) return;
                         mModel.set(StatusProperties.STATUS_ICON, favicon);
+                        mModel.set(StatusProperties.STATUS_ICON_TINT_RES, 0);
                     });
                 }
             }
-            // None of the icons associated with dse should be tinted.
-            mModel.set(StatusProperties.STATUS_ICON_TINT_RES, 0);
+            tint = icon == R.drawable.ic_logo_googleg_24dp ? 0 : mSecurityIconTintRes;
+            mModel.set(StatusProperties.STATUS_ICON_RES, icon);
+            mModel.set(StatusProperties.STATUS_ICON_TINT_RES, tint);
             return;
         } else {
             mShouldCancelCustomFavicon = true;
         }
 
-        int icon = 0;
-        int tint = 0;
-        int toast = 0;
-
         mIsSecurityButtonShown = false;
         if (mUrlHasFocus) {
             if (mShowStatusIconWhenUrlFocused) {

chrome/android/junit/src/org/chromium/chrome/browser/omnibox/status/StatusMediatorUnitTest.java

@@ -141,6 +141,18 @@ public final class StatusMediatorUnitTest {
         Assert.assertEquals(0, mModel.get(StatusProperties.STATUS_ICON_RES));
     }
 
+    @Test
+    @Features.EnableFeatures(ChromeFeatureList.OMNIBOX_SEARCH_ENGINE_LOGO)
+    public void searchEngineLogo_tintAppliedToLoupe() {
+        setupSearchEngineLogoForTesting(true, true, true, false);
+        Mockito.doReturn(false).when(mToolbarCommonPropertiesModel).isIncognito();
+
+        mMediator.setUrlHasFocus(true);
+        mMediator.setShowIconsWhenUrlFocused(true);
+        mMediator.setSecurityIconTint(11);
+        Assert.assertEquals(11, mModel.get(StatusProperties.STATUS_ICON_TINT_RES));
+    }
+
     private void setupSearchEngineLogoForTesting(
             boolean shouldShowLogo, boolean showGoogle, boolean loupeEverywhere, boolean validUrl) {
         Mockito.doReturn(shouldShowLogo).when(mDelegate).shouldShowSearchEngineLogo(false);