Fixed favicon for ephemeral tab

This CL removes the blue tint from the favicon and sets the default icon
to default favicon instead of chrome logo.

Bug: 1014348
Change-Id: Ida83b849ef2cac7861f56a6a68c39fea80a569b2
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1861503
Commit-Queue: Shakti Sahu <shaktisahu@chromium.org>
Reviewed-by: Matthew Jones <mdjones@chromium.org>
Reviewed-by: Jinsuk Kim <jinsukkim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#706714}

chrome/android/java/res/layout/ephemeral_tab_toolbar.xml

@@ -33,8 +33,6 @@
                 android:layout_marginEnd="8dp"
                 android:layout_marginTop="12dp"
                 android:padding="12dp"
-                android:src="@drawable/ic_chrome"
-                app:tint="@color/default_icon_color_blue"
                 android:scaleType="fitCenter"
                 tools:ignore="ContentDescription" />
 

chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabCoordinator.java

@@ -219,6 +219,7 @@ public class EphemeralTabCoordinator implements View.OnLayoutChangeListener {
 
         @Override
         public void onSSLStateUpdated() {
+            if (mSheetContent == null) return;
             int securityLevel = SecurityStateModel.getSecurityLevelForWebContents(
                     mPanelContent.getWebContents());
             mSheetContent.setSecurityIcon(getSecurityIconResource(securityLevel));
@@ -281,9 +282,15 @@ public class EphemeralTabCoordinator implements View.OnLayoutChangeListener {
          */
         public void loadFavicon(final String url, Callback<Drawable> callback) {
             FaviconHelper.FaviconImageCallback imageCallback = (bitmap, iconUrl) -> {
-                Drawable drawable =
-                        FaviconUtils.getIconDrawableWithFilter(bitmap, url, mIconGenerator,
-                                mDefaultFaviconHelper, mContext.getResources(), mFaviconSize);
+                Drawable drawable;
+                if (bitmap != null) {
+                    drawable = FaviconUtils.createRoundedBitmapDrawable(
+                            mContext.getResources(), bitmap);
+                } else {
+                    drawable = mDefaultFaviconHelper.getDefaultFaviconDrawable(
+                            mContext.getResources(), iconUrl, true);
+                }
+
                 callback.onResult(drawable);
             };
 

chrome/android/java/src/org/chromium/chrome/browser/compositor/bottombar/ephemeraltab/EphemeralTabSheetContent.java

@@ -130,7 +130,11 @@ public class EphemeralTabSheetContent implements BottomSheet.BottomSheetContent
 
     /** Method to be called to start the favicon anmiation. */
     public void startFaviconAnimation(Drawable favicon) {
-        assert favicon != null;
+        if (favicon == null) {
+            mCurrentFavicon = null;
+            mFaviconView.setImageDrawable(null);
+            return;
+        }
 
         // TODO(shaktisahu): Find out if there is a better way for this animation.
         Drawable presentedDrawable = favicon;