Align favicon fade-in with placeholder fade-out

Bug: chromium:907494
Change-Id: I123ff28187f2cc482ae89453e2bd79a2414f9e04
Reviewed-on: https://chromium-review.googlesource.com/c/1372895Reviewed-by: Bret Sepulveda <bsep@chromium.org>
Commit-Queue: Peter Boström <pbos@chromium.org>
Cr-Commit-Position: refs/heads/master@{#615773}

chrome/browser/ui/views/tabs/tab_icon.cc

@@ -267,8 +267,8 @@ void TabIcon::UpdatePendingAnimationState() {
   }
 
   if (pending_animation_state_.favicon_placeholder_alpha) {
-    if (network_state_ == TabNetworkState::kWaiting ||
-        pending_animation_state_.loading_progress_animation_pending) {
+    // Fade in until the favicon fade-in starts. Then fade out.
+    if (!pending_animation_state_.favicon_fade_in_progress) {
       pending_animation_state_.favicon_placeholder_alpha =
           std::min(*pending_animation_state_.favicon_placeholder_alpha +
                        animation_delta_ms / kFaviconPlaceholderFadeInMs,