[ash-md] Added a delay between system menu default/detailed view transitions.

ash/common/system/tray/tray_details_view_unittest.cc

 // Copyright 2013 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/common/system/tray/tray_details_view.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/special_popup_row.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_item.h"
+#include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_popup_header_button.h"
 #include "ash/common/system/tray/view_click_listener.h"
 #include "ash/test/ash_test_base.h"
 #include "base/run_loop.h"
+#include "base/test/scoped_mock_time_message_loop_task_runner.h"
+#include "base/test/test_mock_time_task_runner.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/events/test/event_generator.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/view.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace test {
 
@@ skipping 103 matching lines @@
     tray->ShowDefaultView(BUBBLE_CREATE_NEW);
     RunAllPendingInMessageLoop();
     tray->ShowDetailedView(test_item, 0, true, BUBBLE_USE_EXISTING);
     RunAllPendingInMessageLoop();
 
     return test_item->detailed_view()->tray_popup_header_button();
   }
 
   void TransitionFromDetailedToDefaultView(TestDetailsView* detailed) {
     detailed->TransitionToDefaultView();
+    scoped_task_runner_.task_runner()->FastForwardBy(

[gab, 2016/11/18 18:18:54]

scoped_task_runner_->FastForwardBy()

should work now :)

[bruthig, 2016/11/18 18:47:59]

Done.

+        base::TimeDelta::FromMilliseconds(
+            GetTrayConstant(TRAY_POPUP_TRANSITION_TO_DEFAULT_DELAY)));
   }
 
   void FocusBackButton(TestDetailsView* detailed) {
     detailed->back_button_->RequestFocus();
   }
 
  private:
+  // Used to control the |transition_delay_timer_|.
+  base::ScopedMockTimeMessageLoopTaskRunner scoped_task_runner_;
+
   DISALLOW_COPY_AND_ASSIGN(TrayDetailsViewTest);
 };
 
 TEST_F(TrayDetailsViewTest, TransitionToDefaultViewTest) {
   SystemTray* tray = GetPrimarySystemTray();
   ASSERT_TRUE(tray->GetWidget());
 
   TestItem* test_item_1 = new TestItem;
   TestItem* test_item_2 = new TestItem;
   tray->AddTrayItem(test_item_1);
@@ skipping 143 matching lines @@
   gfx::Rect bounds = button->GetBoundsInScreen();
   gfx::Point initial_point(bounds.x() - 1, bounds.y());
   generator.set_current_location(initial_point);
   generator.MoveMouseBy(1, 0);
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(button->background());
 }
 
 }  // namespace test
 }  // namespace ash