Stop animator in final position if no animation

If the omnibox expansion should be done without animation, stop the
animator in its final position right after it begins.

Bug: 791033
Cq-Include-Trybots: master.tryserver.chromium.mac:ios-simulator-cronet;master.tryserver.chromium.mac:ios-simulator-full-configs
Change-Id: I7af68d6dcd43a0643365003f2b7fff70fec3dc72
Reviewed-on: https://chromium-review.googlesource.com/803714Reviewed-by: Sergio Collazos <sczs@chromium.org>
Commit-Queue: Gauthier Ambard <gambard@chromium.org>
Cr-Commit-Position: refs/heads/master@{#521632}

ios/chrome/browser/ui/toolbar/clean/toolbar_coordinator.mm

@@ -540,10 +540,9 @@
   // There's no Toolbar expanding on iPad.
   if (IsIPadIdiom())
     return;
-  NSTimeInterval duration = animated ? ios::material::kDuration1 : 0;
 
   UIViewPropertyAnimator* animator = [[UIViewPropertyAnimator alloc]
-      initWithDuration:duration
+      initWithDuration:ios::material::kDuration1
                  curve:UIViewAnimationCurveEaseInOut
             animations:^{
             }];
@@ -551,6 +550,11 @@
   [self.locationBarView addExpandOmniboxAnimations:animator];
   [self.toolbarViewController addToolbarExpansionAnimations:animator];
   [animator startAnimation];
+
+  if (!animated) {
+    [animator stopAnimation:NO];
+    [animator finishAnimationAtPosition:UIViewAnimatingPositionEnd];
+  }
 }
 
 // Animates |_toolbar| and |_locationBarView| for omnibox contraction.