Thread ui opacity animations

ash/desktop_background/desktop_background_controller_unittest.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 "ash/desktop_background/desktop_background_controller.h"
 
 #include "ash/desktop_background/desktop_background_widget_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "ui/aura/root_window.h"
+#include "ui/compositor/test/layer_animator_test_controller.h"
 
 using aura::RootWindow;
 using aura::Window;
 
 namespace {
 
 // Containers IDs used for tests.
 const int kDesktopBackgroundId =
     ash::internal::kShellWindowId_DesktopBackgroundContainer;
 const int kLockScreenBackgroundId =
     ash::internal::kShellWindowId_LockScreenBackgroundContainer;
 
 // Returns number of child windows in a shell window container.
 int ChildCountForContainer(int container_id) {
   RootWindow* root = ash::Shell::GetPrimaryRootWindow();
   Window* container = root->GetChildById(container_id);
   return static_cast<int>(container->children().size());
 }
 
 // Steps a widget's layer animation until it is completed. Animations must be
 // enabled.
 void RunAnimationForWidget(views::Widget* widget) {
   // Animations must be enabled for stepping to work.
   DCHECK(!ui::LayerAnimator::disable_animations_for_test());
 
   ui::Layer* layer = widget->GetNativeView()->layer();
-  ui::LayerAnimator* animator = layer->GetAnimator();
+  ui::LayerAnimatorTestController controller(layer->GetAnimator());
   ui::AnimationContainerElement* element = layer->GetAnimator();
   // Multiple steps are required to complete complex animations.
   // TODO(vollick): This should not be necessary. crbug.com/154017
-  while (animator->is_animating()) {
-    base::TimeTicks step_time = animator->last_step_time();
+  while (controller.animator()->is_animating()) {
+    controller.StartThreadedAnimationsIfNeeded();
+    base::TimeTicks step_time = controller.animator()->last_step_time();
     element->Step(step_time + base::TimeDelta::FromMilliseconds(1000));
   }
 }
 
 }  // namespace
 
 namespace ash {
 namespace internal {
 
 class DesktopBackgroundControllerTest : public test::AshTestBase {
@@ skipping 166 matching lines @@
 
   EXPECT_TRUE(root->GetProperty(kDesktopController));
   EXPECT_FALSE(
       root->GetProperty(kAnimatingDesktopController)->GetController(false));
   // The desktop controller should be the last created animating controller.
   EXPECT_EQ(animatingController, root->GetProperty(kDesktopController));
 }
 
 }  // namespace internal
 }  // namespace ash