Overview Button Tray Animation accounting for startup

ash/system/tray/system_tray_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/system/tray/system_tray.h"
 
 #include <vector>
 
 #include "ash/accessibility_delegate.h"
 #include "ash/root_window_controller.h"
 #include "ash/shelf/shelf_layout_manager.h"
 #include "ash/shelf/shelf_widget.h"
 #include "ash/shell.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/tray/system_tray_item.h"
 #include "ash/system/tray/tray_constants.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/window_util.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/test/event_generator.h"
 #include "ui/aura/window.h"
 #include "ui/base/ui_base_types.h"
+#include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/gfx/geometry/rect.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/layout/fill_layout.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 
 #if defined(OS_WIN)
 #include "base/win/windows_version.h"
 #endif
@@ skipping 442 matching lines @@
   ASSERT_TRUE(accessibility);
   EXPECT_TRUE(accessibility->visible());
 
   const views::View* settings =
       tray->GetSystemBubble()->bubble_view()->GetViewByID(
           test::kSettingsTrayItemViewId);
   ASSERT_TRUE(settings);
   EXPECT_TRUE(settings->visible());
 }
 
+// Tests that if SetVisible(true) is called while animating to hidden that the
+// tray becomes visible, and stops animating to hidden.
+TEST_F(SystemTrayTest, SetVisibleDuringHideAnimation) {
+  SystemTray* tray = GetSystemTray();
+  ASSERT_TRUE(tray->visible());
+
+  ui::ScopedAnimationDurationScaleMode long_duration(
+      ui::ScopedAnimationDurationScaleMode::SLOW_DURATION);
+  tray->SetVisible(false);
+  EXPECT_TRUE(tray->visible());
+  EXPECT_EQ(0.0f, tray->layer()->GetTargetOpacity());
+
+  tray->SetVisible(true);
+  EXPECT_TRUE(tray->visible());

[flackr, 2014/05/14 17:32:43]

This test should end the animation before verifying that it has the right
visibility state (i.e. let ScopedAnimationDurationScaleMode go out of scope).
Does it actually catch the current failure?

[jonross, 2014/05/14 23:28:47]

Updated to set clear the scoped duration, and set a zero duration. To confirm
the final states.

The test was written before the fix and identifies the error.

+  EXPECT_EQ(1.0f, tray->layer()->GetTargetOpacity());
+}
+
 }  // namespace test
 }  // namespace ash