Fix tab presentation metrics

ios/chrome/browser/ui/browser_view_controller.mm

 // Copyright 2012 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.
 
 #import "ios/chrome/browser/ui/browser_view_controller.h"
 
 #import <AssetsLibrary/AssetsLibrary.h>
 #import <MobileCoreServices/MobileCoreServices.h>
 #import <PassKit/PassKit.h>
 #import <Photos/Photos.h>
@@ skipping 1621 matching lines @@
           // tab's view hasn't been displayed yet because it was in a new tab
           // animation.
           Tab* currentTab = [_model currentTab];
           if (currentTab) {
             [self tabSelected:currentTab];
           }
           startVoiceSearchIfNecessaryBlock();
 
           if (self.foregroundTabWasAddedCompletionBlock) {
             self.foregroundTabWasAddedCompletionBlock();
+            self.foregroundTabWasAddedCompletionBlock = nil;
           }
         });
   } else {
     // -updateSnapshotWithOverlay will force a screen redraw, so take the
     // snapshot before adding the views needed for the background animation.
     Tab* topTab = [_model currentTab];
     UIImage* image = [topTab updateSnapshotWithOverlay:YES
                                       visibleFrameOnly:self.isToolbarOnScreen];
     // Add three layers in order on top of the contentArea for the animation:
     // 1. The black "background" screen.
@@ skipping 18 matching lines @@
           [topCard removeFromSuperview];
           self.inNewTabAnimation = NO;
           // Resnapshot the top card if it has its own toolbar, as the toolbar
           // will be captured in the new tab animation, but isn't desired for
           // the stack view snapshots.
           id nativeController = [self nativeControllerForTab:topTab];
           if ([nativeController conformsToProtocol:@protocol(ToolbarOwner)])
             [topTab updateSnapshotWithOverlay:YES visibleFrameOnly:YES];
           startVoiceSearchIfNecessaryBlock();
         });
+    // Reset the foreground tab completion block so that it can never be
+    // called more than once regardless of foreground/background tab
+    // appearances.
+    self.foregroundTabWasAddedCompletionBlock = nil;
   }
-  // Reset the foreground tab completion block so that it can never be
-  // called more than once regardless of foreground/background tab appearances.
-  self.foregroundTabWasAddedCompletionBlock = nil;
 }
 
 #pragma mark - UI Configuration and Layout
 
 - (void)updateWithTabModel:(TabModel*)model
               browserState:(ios::ChromeBrowserState*)browserState {
   DCHECK(model);
   DCHECK(browserState);
   DCHECK(!_model);
   DCHECK(!_browserState);
@@ skipping 3546 matching lines @@
 
 - (UIView*)voiceSearchButton {
   return _voiceSearchButton;
 }
 
 - (id<LogoAnimationControllerOwner>)logoAnimationControllerOwner {
   return [self currentLogoAnimationControllerOwner];
 }
 
 @end