Show correct favicons on Tab strip

Changes to make sure the favicons on Tab strip show correctly. Show
corresponding favicons for pages with icons and default globe icon
(R.drawable.ic_globe_24dp) for unknown or loading pages. Show chrome
icon (R.drawable.chromelogo16) for native pages.

Bug: 937941, 941293
Change-Id: Iff0da86cc9eb33781aeacca4c22085ac5b060cd7
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1524912
Commit-Queue: Yue Zhang <yuezhanggg@google.com>
Reviewed-by: Yusuf Ozuysal <yusufo@chromium.org>
Reviewed-by: Wei-Yin Chen (陳威尹) <wychen@chromium.org>
Cr-Commit-Position: refs/heads/master@{#642690}

chrome/android/features/tab_ui/BUILD.gn

@@ -34,6 +34,7 @@ android_library("java") {
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabStripToolbarViewProperties.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabStripViewBinder.java",
     "java/src/org/chromium/chrome/browser/tasks/tab_management/TabStripViewHolder.java",
+    "java/src/org/chromium/chrome/browser/tasks/tab_management/TabListFaviconProvider.java",
   ]
 
   classpath_deps = [

chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/SilenceLintErrors.java

@@ -25,7 +25,8 @@ import org.chromium.chrome.R;
                     R.string.bottom_tab_grid_new_tab, R.plurals.bottom_tab_grid_title_placeholder,
                     R.string.iph_tab_groups_tap_to_see_another_tab_accessibility_text,
                     R.string.accessibility_bottom_tab_strip_expand_tab_sheet,
-                    R.layout.bottom_tab_strip_toolbar, R.drawable.tabstrip_selected};
+                    R.layout.bottom_tab_strip_toolbar, R.drawable.tabstrip_selected,
+                    R.drawable.tabstrip_favicon_background};
 
     private SilenceLintErrors() {}
 }

chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGridViewBinder.java

@@ -58,7 +58,7 @@ class TabGridViewBinder {
                 item.get(TabProperties.TAB_CLOSED_LISTENER).run(holder.getTabId());
             });
         } else if (TabProperties.FAVICON == propertyKey) {
-            holder.favicon.setImageBitmap(item.get(TabProperties.FAVICON));
+            holder.favicon.setImageDrawable(item.get(TabProperties.FAVICON));
         } else if (TabProperties.THUMBNAIL_FETCHER == propertyKey) {
             TabListMediator.ThumbnailFetcher fetcher = item.get(TabProperties.THUMBNAIL_FETCHER);
             if (fetcher == null) return;

chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabGroupUiMediator.java

@@ -80,7 +80,9 @@ public class TabGroupUiMediator implements Destroyable {
         mTabModelObserver = new EmptyTabModelObserver() {
             @Override
             public void didSelectTab(Tab tab, @TabSelectionType int type, int lastId) {
-                if (getRelatedTabsForId(lastId).contains(tab)) return;
+                if (type == TabSelectionType.FROM_CLOSE
+                        || getRelatedTabsForId(lastId).contains(tab))
+                    return;
                 resetTabStripWithRelatedTabsForId(tab.getId());
             }
 

chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListCoordinator.java

@@ -15,7 +15,6 @@ import android.view.ViewGroup;
 
 import org.chromium.chrome.R;
 import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
-import org.chromium.chrome.browser.favicon.FaviconHelper;
 import org.chromium.chrome.browser.lifecycle.Destroyable;
 import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tab.Tab;
@@ -107,8 +106,11 @@ public class TabListCoordinator implements Destroyable {
 
         mRecyclerView.setHasFixedSize(true);
 
-        mMediator = new TabListMediator(Profile.getLastUsedProfile(), tabListModel, context,
-                tabModelSelector, tabContentManager, new FaviconHelper(), componentName);
+        TabListFaviconProvider mTabListFaviconProvider =
+                new TabListFaviconProvider(context, Profile.getLastUsedProfile());
+
+        mMediator = new TabListMediator(tabListModel, tabModelSelector, tabContentManager,
+                mTabListFaviconProvider, componentName);
     }
 
     /**

chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListFaviconProvider.java

+// Copyright 2019 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.tasks.tab_management;
+
+import android.content.Context;
+import android.graphics.Bitmap;
+import android.graphics.BitmapFactory;
+import android.graphics.Canvas;
+import android.graphics.drawable.Drawable;
+import android.support.v7.content.res.AppCompatResources;
+
+import org.chromium.base.Callback;
+import org.chromium.chrome.R;
+import org.chromium.chrome.browser.favicon.FaviconHelper;
+import org.chromium.chrome.browser.native_page.NativePageFactory;
+import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.util.ViewUtils;
+
+/**
+ * Provider for processed favicons in Tab list.
+ */
+public class TabListFaviconProvider {
+    private static Drawable sGlobeDrawable;
+    private static Drawable sChromeDrawable;
+    private final int mFaviconSize;
+    private final Profile mProfile;
+    private final FaviconHelper mFaviconHelper;
+
+    /**
+     * Construct the provider that provides favicons for tab list.
+     * @param context The context to use for accessing {@link android.content.res.Resources}
+     * @param profile The profile to use for getting favicons.
+     */
+    public TabListFaviconProvider(Context context, Profile profile) {
+        mFaviconSize = context.getResources().getDimensionPixelSize(R.dimen.default_favicon_size);
+        mProfile = profile;
+        mFaviconHelper = new FaviconHelper();
+        if (sGlobeDrawable == null) {
+            Drawable globeDrawable =
+                    AppCompatResources.getDrawable(context, R.drawable.ic_globe_24dp);
+            Bitmap globeBitmap =
+                    Bitmap.createBitmap(mFaviconSize, mFaviconSize, Bitmap.Config.ARGB_8888);
+            Canvas canvas = new Canvas(globeBitmap);
+            globeDrawable.setBounds(0, 0, mFaviconSize, mFaviconSize);
+            globeDrawable.draw(canvas);
+            sGlobeDrawable = processBitmap(globeBitmap);
+        }
+        if (sChromeDrawable == null) {
+            Bitmap chromeBitmap =
+                    BitmapFactory.decodeResource(context.getResources(), R.drawable.chromelogo16);
+            sChromeDrawable = processBitmap(chromeBitmap);
+        }
+    }
+
+    private Drawable processBitmap(Bitmap bitmap) {
+        return ViewUtils.createRoundedBitmapDrawable(
+                Bitmap.createScaledBitmap(bitmap, mFaviconSize, mFaviconSize, true),
+                ViewUtils.DEFAULT_FAVICON_CORNER_RADIUS);
+    }
+
+    /**
+     * @return The scaled rounded Globe Drawable as default favicon.
+     */
+    public Drawable getDefaultFaviconDrawable() {
+        return sGlobeDrawable;
+    }
+
+    /**
+     * Asynchronously get the processed favicon Drawable.
+     * @param url The URL whose favicon is requested.
+     * @param isIncognito Whether the tab is incognito or not.
+     * @param faviconCallback The callback that requests for favicon.
+     */
+    public void getFaviconForUrlAsync(
+            String url, boolean isIncognito, Callback<Drawable> faviconCallback) {
+        if (NativePageFactory.isNativePageUrl(url, isIncognito)) {
+            faviconCallback.onResult(sChromeDrawable);
+        } else {
+            mFaviconHelper.getLocalFaviconImageForURL(
+                    mProfile, url, mFaviconSize, (image, iconUrl) -> {
+                        if (image == null) return;
+                        Drawable drawable = processBitmap(image);
+                        faviconCallback.onResult(drawable);
+                    });
+        }
+    }
+
+    /**
+     * Synchronously get the processed favicon Drawable.
+     * @param url The URL whose favicon is requested.
+     * @param isIncognito Whether the tab is in cognito or not.
+     * @param icon The favicon that was received.
+     * @return The processed favicon.
+     */
+    public Drawable getFaviconForUrlSync(String url, boolean isIncognito, Bitmap icon) {
+        if (icon == null) {
+            boolean isNativeUrl = NativePageFactory.isNativePageUrl(url, isIncognito);
+            return isNativeUrl ? sChromeDrawable : sGlobeDrawable;
+        } else {
+            return processBitmap(icon);
+        }
+    }
+}

chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediator.java

@@ -4,20 +4,17 @@
 
 package org.chromium.chrome.browser.tasks.tab_management;
 
-import android.content.Context;
 import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
 import android.support.annotation.Nullable;
 
 import org.chromium.base.Callback;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
-import org.chromium.chrome.R;
 import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
-import org.chromium.chrome.browser.favicon.FaviconHelper;
-import org.chromium.chrome.browser.profiles.Profile;
+import org.chromium.chrome.browser.native_page.NativePageFactory;
 import org.chromium.chrome.browser.tab.EmptyTabObserver;
 import org.chromium.chrome.browser.tab.Tab;
-import org.chromium.chrome.browser.tab.TabFavicon;
 import org.chromium.chrome.browser.tab.TabObserver;
 import org.chromium.chrome.browser.tabmodel.EmptyTabModelObserver;
 import org.chromium.chrome.browser.tabmodel.TabModel;
@@ -25,6 +22,7 @@ import org.chromium.chrome.browser.tabmodel.TabModelObserver;
 import org.chromium.chrome.browser.tabmodel.TabModelSelector;
 import org.chromium.chrome.browser.tabmodel.TabModelUtils;
 import org.chromium.chrome.browser.tabmodel.TabSelectionType;
+import org.chromium.content_public.browser.NavigationHandle;
 import org.chromium.ui.modelutil.PropertyModel;
 
 import java.util.ArrayList;
@@ -61,12 +59,10 @@ class TabListMediator {
             mThumbnailProvider.getTabThumbnailWithCallback(mTab, callback);
         }
     }
-    private final int mFaviconSize;
-    private final FaviconHelper mFaviconHelper;
+    private final TabListFaviconProvider mTabListFaviconProvider;
     private final TabListModel mModel;
     private final TabModelSelector mTabModelSelector;
     private final TabContentManager mTabContentManager;
-    private final Profile mProfile;
     private final String mComponentName;
 
     private final TabActionListener mTabSelectedListener = new TabActionListener() {
@@ -120,6 +116,16 @@ class TabListMediator {
     };
 
     private final TabObserver mTabObserver = new EmptyTabObserver() {
+        @Override
+        public void onDidStartNavigation(Tab tab, NavigationHandle navigationHandle) {
+            if (NativePageFactory.isNativePageUrl(tab.getUrl(), tab.isIncognito())) return;
+            if (navigationHandle.isSameDocument() || !navigationHandle.isInMainFrame()) return;
+            if (mModel.indexFromId(tab.getId()) == TabModel.INVALID_TAB_INDEX) return;
+            mModel.get(mModel.indexFromId(tab.getId()))
+                    .set(TabProperties.FAVICON,
+                            mTabListFaviconProvider.getDefaultFaviconDrawable());
+        }
+
         @Override
         public void onTitleUpdated(Tab updatedTab) {
             int index = mModel.indexFromId(updatedTab.getId());
@@ -131,7 +137,9 @@ class TabListMediator {
         public void onFaviconUpdated(Tab updatedTab, Bitmap icon) {
             int index = mModel.indexFromId(updatedTab.getId());
             if (index == TabModel.INVALID_TAB_INDEX) return;
-            mModel.get(index).set(TabProperties.FAVICON, icon);
+            Drawable drawable = mTabListFaviconProvider.getFaviconForUrlSync(
+                    updatedTab.getUrl(), updatedTab.isIncognito(), icon);
+            mModel.get(index).set(TabProperties.FAVICON, drawable);
         }
     };
 
@@ -146,22 +154,19 @@ class TabListMediator {
      * Construct the Mediator with the given Models and observing hooks from the given
      * ChromeActivity.
      * @param model The Model to keep state about a list of {@link Tab}s.
-     * @param context The context to use for accessing {@link android.content.res.Resources}
      * @param tabModelSelector {@link TabModelSelector} that will provide and receive signals about
      *                                                 the tabs concerned.
      * @param tabContentManager {@link TabContentManager} to provide screenshot related details.
      * @param componentName This is a unique string to identify different components.
      */
-    public TabListMediator(Profile profile, TabListModel model, Context context,
-            TabModelSelector tabModelSelector, TabContentManager tabContentManager,
-            FaviconHelper faviconHelper, String componentName) {
-        mFaviconSize = context.getResources().getDimensionPixelSize(R.dimen.tab_grid_favicon_size);
 
+    public TabListMediator(TabListModel model, TabModelSelector tabModelSelector,
+            TabContentManager tabContentManager, TabListFaviconProvider tabListFaviconProvider,
+            String componentName) {
         mTabModelSelector = tabModelSelector;
         mTabContentManager = tabContentManager;
         mModel = model;
-        mFaviconHelper = faviconHelper;
-        mProfile = profile;
+        mTabListFaviconProvider = tabListFaviconProvider;
         mComponentName = componentName;
 
         mTabModelObserver = new EmptyTabModelObserver() {
@@ -243,7 +248,8 @@ class TabListMediator {
                 new PropertyModel.Builder(TabProperties.ALL_KEYS_TAB_GRID)
                         .with(TabProperties.TAB_ID, tab.getId())
                         .with(TabProperties.TITLE, tab.getTitle())
-                        .with(TabProperties.FAVICON, TabFavicon.getBitmap(tab))
+                        .with(TabProperties.FAVICON,
+                                mTabListFaviconProvider.getDefaultFaviconDrawable())
                         .with(TabProperties.IS_SELECTED, isSelected)
                         .with(TabProperties.TAB_SELECTED_LISTENER, mTabSelectedListener)
                         .with(TabProperties.TAB_CLOSED_LISTENER, mTabClosedListener)
@@ -253,11 +259,16 @@ class TabListMediator {
         } else {
             mModel.add(index, tabInfo);
         }
-        mFaviconHelper.getLocalFaviconImageForURL(
-                mProfile, tab.getUrl(), mFaviconSize, (image, iconUrl) -> {
-                    if (mModel.indexFromId(tab.getId()) == Tab.INVALID_TAB_ID) return;
-                    mModel.get(mModel.indexFromId(tab.getId())).set(TabProperties.FAVICON, image);
-                });
+
+        Callback<Drawable> faviconCallback = drawable -> {
+            int modelIndex = mModel.indexFromId(tab.getId());
+            if (modelIndex != Tab.INVALID_TAB_ID && drawable != null) {
+                mModel.get(modelIndex).set(TabProperties.FAVICON, drawable);
+            }
+        };
+        mTabListFaviconProvider.getFaviconForUrlAsync(
+                tab.getUrl(), tab.isIncognito(), faviconCallback);
+
         ThumbnailFetcher callback =
                 new ThumbnailFetcher(mTabContentManager::getTabThumbnailWithCallback, tab);
         tabInfo.set(TabProperties.THUMBNAIL_FETCHER, callback);

chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabProperties.java

@@ -4,7 +4,7 @@
 
 package org.chromium.chrome.browser.tasks.tab_management;
 
-import android.graphics.Bitmap;
+import android.graphics.drawable.Drawable;
 
 import org.chromium.ui.modelutil.PropertyKey;
 import org.chromium.ui.modelutil.PropertyModel;
@@ -24,7 +24,7 @@ public class TabProperties {
     public static final WritableObjectPropertyKey<TabListMediator.TabActionListener>
             TAB_CLOSED_LISTENER = new WritableObjectPropertyKey<>();
 
-    public static final WritableObjectPropertyKey<Bitmap> FAVICON =
+    public static final WritableObjectPropertyKey<Drawable> FAVICON =
             new WritableObjectPropertyKey<>();
 
     public static final WritableObjectPropertyKey<TabListMediator.ThumbnailFetcher>

chrome/android/features/tab_ui/java/src/org/chromium/chrome/browser/tasks/tab_management/TabStripViewBinder.java

@@ -4,7 +4,6 @@
 
 package org.chromium.chrome.browser.tasks.tab_management;
 
-import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
 import android.support.annotation.Nullable;
 import android.support.v4.content.res.ResourcesCompat;
@@ -12,7 +11,6 @@ import android.support.v7.widget.RecyclerView.ViewHolder;
 import android.widget.FrameLayout;
 
 import org.chromium.chrome.R;
-import org.chromium.chrome.browser.util.ViewUtils;
 import org.chromium.ui.modelutil.PropertyKey;
 import org.chromium.ui.modelutil.PropertyModel;
 
@@ -56,14 +54,11 @@ class TabStripViewBinder {
                         R.string.accessibility_tabstrip_tab, title));
             }
         } else if (TabProperties.FAVICON == propertyKey) {
-            Bitmap favicon = item.get(TabProperties.FAVICON);
-            if (favicon == null) return;
-            int faviconSize = holder.itemView.getContext().getResources().getDimensionPixelSize(
-                    R.dimen.default_favicon_size);
-            Drawable drawable = ViewUtils.createRoundedBitmapDrawable(
-                    Bitmap.createScaledBitmap(favicon, faviconSize, faviconSize, true),
-                    ViewUtils.DEFAULT_FAVICON_CORNER_RADIUS);
-            holder.button.setImageDrawable(drawable);
+            Drawable faviconDrawable = item.get(TabProperties.FAVICON);
+            holder.button.setBackgroundResource(R.drawable.tabstrip_favicon_background);
+            if (faviconDrawable != null) {
+                holder.button.setImageDrawable(faviconDrawable);
+            }
         } else if (TabProperties.TAB_ID == propertyKey) {
             holder.setTabId(item.get(TabProperties.TAB_ID));
         }

chrome/android/features/tab_ui/junit/src/org/chromium/chrome/browser/tasks/tab_management/TabListMediatorUnitTest.java

@@ -10,7 +10,9 @@ import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertThat;
 import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyBoolean;
 import static org.mockito.ArgumentMatchers.anyInt;
+import static org.mockito.ArgumentMatchers.anyString;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.doNothing;
 import static org.mockito.Mockito.doReturn;
@@ -18,9 +20,9 @@ import static org.mockito.Mockito.mock;
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-import android.content.Context;
-import android.content.res.Resources;
-import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.drawable.ColorDrawable;
+import android.graphics.drawable.Drawable;
 import android.view.View;
 
 import org.junit.After;
@@ -33,12 +35,12 @@ import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
 import org.robolectric.annotation.Config;
 
+import org.chromium.base.Callback;
 import org.chromium.base.UserDataHost;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.metrics.RecordUserAction;
 import org.chromium.chrome.browser.compositor.layouts.content.TabContentManager;
 import org.chromium.chrome.browser.favicon.FaviconHelper;
-import org.chromium.chrome.browser.profiles.Profile;
 import org.chromium.chrome.browser.tab.Tab;
 import org.chromium.chrome.browser.tab.TabObserver;
 import org.chromium.chrome.browser.tabmodel.TabLaunchType;
@@ -57,7 +59,6 @@ import java.util.List;
 @RunWith(LocalRobolectricTestRunner.class)
 @Config(manifest = Config.NONE)
 public class TabListMediatorUnitTest {
-    private static final int MOCK_FAVICON_SIZE = 10;
     private static final String TAB1_TITLE = "Tab1";
     private static final String TAB2_TITLE = "Tab2";
     private static final String TAB3_TITLE = "Tab3";
@@ -75,19 +76,15 @@ public class TabListMediatorUnitTest {
     @Mock
     TabModel mTabModel;
     @Mock
-    Context mContext;
-    @Mock
-    Resources mResources;
-    @Mock
-    FaviconHelper mFaviconHelper;
-    @Mock
-    Profile mProfile;
+    TabListFaviconProvider mTabListFaviconProvider;
     @Captor
     ArgumentCaptor<TabModelObserver> mTabModelObserverCaptor;
     @Captor
     ArgumentCaptor<FaviconHelper.FaviconImageCallback> mFaviconCallbackCaptor;
     @Captor
     ArgumentCaptor<TabObserver> mTabObserverCaptor;
+    @Captor
+    ArgumentCaptor<Callback<Drawable>> mCallbackCaptor;
 
     private Tab mTab1;
     private Tab mTab2;
@@ -108,12 +105,6 @@ public class TabListMediatorUnitTest {
         tabModelList.add(mTabModel);
 
         doNothing().when(mTabContentManager).getTabThumbnailWithCallback(any(), any());
-        doReturn(mResources).when(mContext).getResources();
-        doReturn(MOCK_FAVICON_SIZE).when(mResources).getDimensionPixelSize(anyInt());
-        doReturn(true)
-                .when(mFaviconHelper)
-                .getLocalFaviconImageForURL(
-                        any(), any(), anyInt(), mFaviconCallbackCaptor.capture());
         doReturn(mTabModel).when(mTabModelSelector).getCurrentModel();
         doReturn(tabModelList).when(mTabModelSelector).getModels();
         doReturn(mTabModelFilterProvider).when(mTabModelSelector).getTabModelFilterProvider();
@@ -126,10 +117,13 @@ public class TabListMediatorUnitTest {
         doNothing().when(mTab1).addObserver(mTabObserverCaptor.capture());
         doReturn(0).when(mTabModel).index();
         doReturn(2).when(mTabModel).getCount();
+        doNothing()
+                .when(mTabListFaviconProvider)
+                .getFaviconForUrlAsync(anyString(), anyBoolean(), mCallbackCaptor.capture());
 
         mModel = new TabListModel();
-        mMediator = new TabListMediator(mProfile, mModel, mContext, mTabModelSelector,
-                mTabContentManager, mFaviconHelper, getClass().getSimpleName());
+        mMediator = new TabListMediator(mModel, mTabModelSelector, mTabContentManager,
+                mTabListFaviconProvider, getClass().getSimpleName());
     }
 
     @After
@@ -257,8 +251,8 @@ public class TabListMediatorUnitTest {
             tabs.add(mTabModel.getTabAt(i));
         }
         mMediator.resetWithListOfTabs(tabs);
-        for (FaviconHelper.FaviconImageCallback callback : mFaviconCallbackCaptor.getAllValues()) {
-            callback.onFaviconAvailable(Bitmap.createBitmap(1, 1, Bitmap.Config.ARGB_8888), null);
+        for (Callback<Drawable> callback : mCallbackCaptor.getAllValues()) {
+            callback.onResult(new ColorDrawable(Color.RED));
         }
 
         assertThat(mModel.size(), equalTo(2));
@@ -269,8 +263,8 @@ public class TabListMediatorUnitTest {
         assertThat(mModel.get(0).get(TabProperties.TITLE), equalTo(TAB1_TITLE));
         assertThat(mModel.get(1).get(TabProperties.TITLE), equalTo(TAB2_TITLE));
 
-        assertThat(mModel.get(0).get(TabProperties.FAVICON), instanceOf(Bitmap.class));
-        assertThat(mModel.get(1).get(TabProperties.FAVICON), instanceOf(Bitmap.class));
+        assertThat(mModel.get(0).get(TabProperties.FAVICON), instanceOf(Drawable.class));
+        assertThat(mModel.get(1).get(TabProperties.FAVICON), instanceOf(Drawable.class));
 
         assertThat(mModel.get(0).get(TabProperties.IS_SELECTED), equalTo(true));
         assertThat(mModel.get(1).get(TabProperties.IS_SELECTED), equalTo(false));

chrome/android/java/res/drawable/tabstrip_favicon_background.xml

+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright 2019 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. -->
+
+<layer-list
+xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:left="8dp"
+        android:top="8dp"
+        android:right="8dp"
+        android:bottom="8dp">
+        <shape
+            android:shape="oval">
+            <solid android:color="@color/modern_grey_100" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file