[Mac Extensions Toolbar] Make the container's animationEndFrame always valid

chrome/browser/ui/views/toolbar/browser_actions_container.cc

 // Copyright 2013 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.
 
 #include "chrome/browser/ui/views/toolbar/browser_actions_container.h"
 
 #include "base/compiler_specific.h"
 #include "base/stl_util.h"
 #include "chrome/browser/extensions/tab_helper.h"
 #include "chrome/browser/profiles/profile.h"
@@ skipping 45 matching lines @@
 };
 
 BrowserActionsContainer::DropPosition::DropPosition(
     size_t row, size_t icon_in_row)
     : row(row), icon_in_row(icon_in_row) {
 }
 
 ////////////////////////////////////////////////////////////////////////////////
 // BrowserActionsContainer
 
-// static
-bool BrowserActionsContainer::disable_animations_during_testing_ = false;
-
 BrowserActionsContainer::BrowserActionsContainer(
     Browser* browser,
     BrowserActionsContainer* main_container)
     : toolbar_actions_bar_(new ToolbarActionsBar(this,
                                                  browser,
                                                  main_container != nullptr)),
       browser_(browser),
       main_container_(main_container),
       popup_owner_(NULL),
       container_width_(0),
@@ skipping 202 matching lines @@
   } else {
     Layout();
     SchedulePaint();
   }
 }
 
 void BrowserActionsContainer::ResizeAndAnimate(
     gfx::Tween::Type tween_type,
     int target_width,
     bool suppress_chevron) {
-  if (resize_animation_ &&
-      !disable_animations_during_testing_ &&
-      !toolbar_actions_bar_->suppress_animation()) {
+  if (resize_animation_ && !toolbar_actions_bar_->suppress_animation()) {
     // Animate! We have to set the animation_target_size_ after calling Reset(),
     // because that could end up calling AnimationEnded which clears the value.
     resize_animation_->Reset();
     suppress_chevron_ = suppress_chevron;
     resize_animation_->SetTweenType(tween_type);
     animation_target_size_ = target_width;
     resize_animation_->Show();
   } else {
     animation_target_size_ = target_width;
     AnimationEnded(resize_animation_.get());
@@ skipping 451 matching lines @@
 
   ui::ThemeProvider* tp = GetThemeProvider();
   if (tp && chevron_) {
     chevron_->SetImage(views::Button::STATE_NORMAL,
                        *tp->GetImageSkiaNamed(IDR_BROWSER_ACTIONS_OVERFLOW));
   }
 
   const int kImages[] = IMAGE_GRID(IDR_DEVELOPER_MODE_HIGHLIGHT);
   highlight_painter_.reset(views::Painter::CreateImageGridPainter(kImages));
 }