[Mac] Fix Animation Issue With the Security State Decoration

chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
diff --git a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
index cce1e9c1d31ad96ddcb112fbee7938ee29ca4738..6f036c27616d46d2971a38456cbc8a76918b5414 100644
--- a/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
+++ b/chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
@@ -530,6 +530,9 @@ void LocationBarViewMac::Layout() {
     }
   }
 
+  if (!security_state_bubble_decoration_->IsVisible())
+    security_state_bubble_decoration_->ResetAnimation();
+
   // These need to change anytime the layout changes.
   // TODO(shess): Anytime the field editor might have changed, the
   // cursor rects almost certainly should have changed.  The tooltips
@@ -891,7 +894,7 @@ void LocationBarViewMac::UpdateSecurityState(bool tab_changed) {
         (is_new_level_secure && should_animate_secure_verbose_) ||
         (!is_new_level_secure && should_animate_nonsecure_verbose_);
 
-    if (security_state_bubble_decoration_->HasAnimatedOut())
+    if (!tab_changed && security_state_bubble_decoration_->HasAnimatedOut())
       security_state_bubble_decoration_->AnimateIn(false);
     else if (tab_changed || !is_animated)
       security_state_bubble_decoration_->ShowWithoutAnimation();