Changes how we detect whether the launcher should be shown when

ui/gfx/compositor/layer_animator_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 "ui/gfx/compositor/layer_animator.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
@@ skipping 992 matching lines @@
 
   // This should interrupt the running sequence causing us to immediately set
   // the target value. The sequence should alse be destructed.
   animator->StartAnimation(sequence.release());
 
   EXPECT_FALSE(animator->IsAnimatingProperty(LayerAnimationElement::BOUNDS));
   EXPECT_EQ(0, num_live_instances);
   CheckApproximatelyEqual(delegate.GetBoundsForAnimation(), target_bounds);
 }
 
+// Verifies GetTargetOpacity() works when multiple sequences are scheduled.
+TEST(LayerAnimatorTest, GetTargetOpacity) {
+  scoped_ptr<LayerAnimator> animator(LayerAnimator::CreateDefaultAnimator());
+  animator->set_preemption_strategy(LayerAnimator::ENQUEUE_NEW_ANIMATION);
+  animator->set_disable_timer_for_test(true);
+  TestLayerAnimationDelegate delegate;
+  animator->SetDelegate(&delegate);
+
+  delegate.SetOpacityFromAnimation(0.0);
+
+  {
+    ScopedLayerAnimationSettings settings(animator.get());
+    animator->SetOpacity(0.5);
+    EXPECT_EQ(0.5, animator->GetTargetOpacity());
+
+    // Because the strategy is ENQUEUE_NEW_ANIMATION the target should now be 1.
+    animator->SetOpacity(1.0);
+    EXPECT_EQ(1.0, animator->GetTargetOpacity());
+  }
+}
+
 }  // namespace ui