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

chrome/browser/ui/search/toolbar_search_animator.cc

 // Copyright (c) 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.
 
 #include "chrome/browser/ui/search/toolbar_search_animator.h"
 
 #include "chrome/browser/ui/search/search_model.h"
 #include "chrome/browser/ui/search/search_types.h"
 #include "chrome/browser/ui/search/toolbar_search_animator_observer.h"
 #include "chrome/browser/ui/tab_contents/tab_contents.h"
@@ skipping 118 matching lines @@
 }
 
 void ToolbarSearchAnimator::InitBackgroundAnimation() {
   ui::MultiAnimation::Parts parts;
   parts.push_back(ui::MultiAnimation::Part(
       background_change_delay_ms_ * InstantUI::GetSlowAnimationScaleFactor(),
       ui::Tween::ZERO));
   parts.push_back(ui::MultiAnimation::Part(
       background_change_duration_ms_ * InstantUI::GetSlowAnimationScaleFactor(),
       ui::Tween::LINEAR));
-  background_animation_.reset(new ui::MultiAnimation(
-      parts,
-      ui::MultiAnimation::GetDefaultTimerInterval()));
+  background_animation_.reset(new ui::MultiAnimation(parts));
   background_animation_->set_continuous(false);
   background_animation_->set_delegate(this);
 }
 
 void ToolbarSearchAnimator::StartBackgroundChange() {
   InitBackgroundAnimation();
   background_animation_->Start();
 }
 
 void ToolbarSearchAnimator::Reset(TabContents* tab_contents) {
   bool notify_background_observers =
       background_animation_.get() && background_animation_->is_animating();
 
   background_animation_.reset();
 
   // Notify observers of animation cancelation.
   if (notify_background_observers) {
     FOR_EACH_OBSERVER(ToolbarSearchAnimatorObserver, observers_,
                       OnToolbarBackgroundAnimatorCanceled(tab_contents));
   }
 }
 
 }  // namespace search
 }  // namespace chrome