Revert 165230 - Merge 164399 - Make MultiAnimation take time param and slow down tab highlight

ui/base/animation/multi_animation.cc

 // Copyright (c) 2011 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 "ui/base/animation/multi_animation.h"
 
 #include "base/logging.h"
 #include "ui/base/animation/animation_delegate.h"
 
 namespace ui {
 
 // Default interval, in ms.
-static const int kDefaultTimerInterval = 20;
+static const int kDefaultInterval = 20;
 
 static int TotalTime(const MultiAnimation::Parts& parts) {
   int time_ms = 0;
   for (size_t i = 0; i < parts.size(); ++i) {
     DCHECK(parts[i].end_time_ms - parts[i].start_time_ms >= parts[i].time_ms);
     time_ms += parts[i].time_ms;
   }
   return time_ms;
 }
 
-MultiAnimation::MultiAnimation(const Parts& parts,
-                               base::TimeDelta timer_interval)
-    : Animation(timer_interval),
+MultiAnimation::MultiAnimation(const Parts& parts)
+    : Animation(base::TimeDelta::FromMilliseconds(kDefaultInterval)),
       parts_(parts),
       cycle_time_ms_(TotalTime(parts)),
       current_value_(0),
       current_part_index_(0),
       continuous_(true) {
   DCHECK(!parts_.empty());
 }
 
 MultiAnimation::~MultiAnimation() {}
 
-// static.
-base::TimeDelta MultiAnimation::GetDefaultTimerInterval() {
-  return base::TimeDelta::FromMilliseconds(kDefaultTimerInterval);
-}
-
 double MultiAnimation::GetCurrentValue() const {
   return current_value_;
 }
 
 void MultiAnimation::Step(base::TimeTicks time_now) {
   double last_value = current_value_;
   size_t last_index = current_part_index_;
 
   int delta = static_cast<int>((time_now - start_time()).InMilliseconds());
   if (delta >= cycle_time_ms_ && !continuous_) {
@@ skipping 33 matching lines @@
 
     *time_ms -= parts_[i].time_ms;
   }
   NOTREACHED();
   *time_ms = 0;
   *part_index = 0;
   return parts_[0];
 }
 
 }  // namespace ui