Enabled tests to control material design ink drop animations.

ui/views/animation/ink_drop_animation_controller_impl.h

 // Copyright 2015 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.
 
 #ifndef UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_IMPL_H_
 #define UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_IMPL_H_
 
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/gfx/geometry/size.h"
 #include "ui/views/animation/ink_drop_animation_controller.h"
 #include "ui/views/animation/ink_drop_animation_observer.h"
 #include "ui/views/views_export.h"
 
 namespace base {
 class Timer;
 }  // namespace base
 
 namespace views {
+namespace test {
+class InkDropAnimationControllerImplTestApi;
+}  // namespace test
+
 class InkDropAnimation;
 class InkDropHost;
 class InkDropHover;
 class InkDropAnimationControllerFactoryTest;
 
 // A functional implementation of an InkDropAnimationController.
 class VIEWS_EXPORT InkDropAnimationControllerImpl
     : public InkDropAnimationController,
       public InkDropAnimationObserver {
  public:
   // Constructs an ink drop controller that will attach the ink drop to the
   // given |ink_drop_host|.
   explicit InkDropAnimationControllerImpl(InkDropHost* ink_drop_host);
   ~InkDropAnimationControllerImpl() override;
 
   // InkDropAnimationController:
   InkDropState GetTargetInkDropState() const override;
   bool IsVisible() const override;
   void AnimateToState(InkDropState ink_drop_state) override;
   void SnapToActivated() override;
   void SetHovered(bool is_hovered) override;
 
  private:
-  friend class InkDropAnimationControllerFactoryTest;
-  friend class InkDropAnimationControllerImplTest;
+  friend class test::InkDropAnimationControllerImplTestApi;
 
   // Destroys |ink_drop_animation_| if it's targeted to the HIDDEN state.
   void DestroyHiddenTargetedAnimations();
 
   // Creates a new InkDropAnimation and sets it to |ink_drop_animation_|. If
   // |ink_drop_animation_| wasn't null then it will be destroyed using
   // DestroyInkDropAnimation().
   void CreateInkDropAnimation();
 
   // Destroys the current |ink_drop_animation_|.
@@ skipping 55 matching lines @@
 
   // The timer used to delay the hover fade in after an ink drop animation.
   scoped_ptr<base::Timer> hover_after_animation_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(InkDropAnimationControllerImpl);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_ANIMATION_INK_DROP_ANIMATION_CONTROLLER_IMPL_H_