Add more tests to test OverviewButtonTray.

ash/system/overview/overview_button_tray_unittest.cc

 // Copyright 2014 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/overview/overview_button_tray.h"
 
+#include "ash/display/window_tree_host_manager.h"
 #include "ash/login_status.h"
 #include "ash/public/cpp/config.h"
 #include "ash/public/cpp/shelf_types.h"
 #include "ash/root_window_controller.h"
 #include "ash/rotator/screen_rotation_animator.h"
 #include "ash/session/session_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/ash_test_helper.h"
 #include "ash/test/status_area_widget_test_helper.h"
 #include "ash/wm/maximize_mode/maximize_mode_controller.h"
 #include "ash/wm/overview/window_selector_controller.h"
 #include "ash/wm/window_util.h"
 #include "base/command_line.h"
 #include "base/test/user_action_tester.h"
 #include "base/time/time.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/window.h"
 #include "ui/compositor/scoped_animation_duration_scale_mode.h"
 #include "ui/display/display_switches.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/events/event.h"
 #include "ui/events/event_constants.h"
 #include "ui/events/gestures/gesture_types.h"
 #include "ui/views/controls/image_view.h"
+#include "ui/wm/core/window_util.h"
 
 namespace ash {
 
 namespace {
 
 const char kTrayOverview[] = "Tray_Overview";
 
 OverviewButtonTray* GetTray() {
   return StatusAreaWidgetTestHelper::GetStatusAreaWidget()
       ->overview_button_tray();
@@ skipping 205 matching lines @@
 
   EXPECT_TRUE(Shell::Get()->window_selector_controller()->ToggleOverview());
   EXPECT_TRUE(Shell::Get()->window_selector_controller()->IsSelecting());
   EXPECT_TRUE(GetTray()->is_active());
 
   EXPECT_TRUE(Shell::Get()->window_selector_controller()->ToggleOverview());
   EXPECT_FALSE(Shell::Get()->window_selector_controller()->IsSelecting());
   EXPECT_FALSE(GetTray()->is_active());
 }
 
-// Test that when a hide animation is aborted via deletion, that the
+// Test that a hide animation can complete.
+TEST_F(OverviewButtonTrayTest, HideAnimationAlwaysCompletes) {
+  Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
+      true);
+  EXPECT_TRUE(GetTray()->visible());
+  GetTray()->SetVisible(false);
+  EXPECT_FALSE(GetTray()->visible());
+}
+
+// Test that when a hide animation is aborted via deletion, the
 // OverviewButton is still hidden.
-TEST_F(OverviewButtonTrayTest, HideAnimationAlwaysCompletes) {
-  // TODO: disabled as ScreenRotationAnimator does not work in mash,
-  // http://crbug.com/696754.
+TEST_F(OverviewButtonTrayTest, HideAnimationAlwaysCompletesOnDelete) {
+  // TODO(wutao): disabled as GetRootWindowForDisplayId does not work in mash,
+  // http://crbug.com/706589.
   if (Shell::GetAshConfig() == Config::MASH)
     return;
 
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
 
   // Long duration for hide animation, to allow it to be interrupted.
   std::unique_ptr<ui::ScopedAnimationDurationScaleMode> hide_duration(
       new ui::ScopedAnimationDurationScaleMode(
           ui::ScopedAnimationDurationScaleMode::SLOW_DURATION));
   GetTray()->SetVisible(false);
 
-  // ScreenRotationAnimator copies the current layers, and deletes them upon
-  // completion. Allow its animation to complete first.
-  std::unique_ptr<ui::ScopedAnimationDurationScaleMode> rotate_duration(
-      new ui::ScopedAnimationDurationScaleMode(
-          ui::ScopedAnimationDurationScaleMode::ZERO_DURATION));
-  ash::ScreenRotationAnimator(display::Display::InternalDisplayId())
-      .Rotate(display::Display::ROTATE_270,
-              display::Display::ROTATION_SOURCE_ACTIVE);
+  aura::Window* root_window =
+      Shell::Get()->window_tree_host_manager()->GetRootWindowForDisplayId(
+          display::Screen::GetScreen()->GetPrimaryDisplay().id());
+  // Colone and delete the old layer tree.
+  std::unique_ptr<ui::LayerTreeOwner> old_layer_tree_owner =
+      ::wm::RecreateLayers(root_window);
+  old_layer_tree_owner.reset();
 
-  RunAllPendingInMessageLoop();
   EXPECT_FALSE(GetTray()->visible());
 }
 
 // Tests that the overview button becomes visible when the user enters
 // maximize mode with a system modal window open, and that it hides once
 // the user exits maximize mode.
 TEST_F(OverviewButtonTrayTest, VisibilityChangesForSystemModalWindow) {
   // TODO(jonross): When CreateTestWindow*() have been unified, use the
   // appropriate method to replace this setup. (crbug.com/483503)
   std::unique_ptr<aura::Window> window(new aura::Window(nullptr));
   window->SetProperty(aura::client::kModalKey, ui::MODAL_TYPE_SYSTEM);
   window->SetType(aura::client::WINDOW_TYPE_NORMAL);
   window->Init(ui::LAYER_TEXTURED);
   window->Show();
   ParentWindowInPrimaryRootWindow(window.get());
 
   ASSERT_TRUE(ShellPort::Get()->IsSystemModalWindowOpen());
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   EXPECT_TRUE(GetTray()->visible());
   Shell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
   EXPECT_FALSE(GetTray()->visible());
 }
 
 }  // namespace ash