Mac: Added a delay before panels go to minimized state from title-only state.

chrome/browser/ui/panels/panel_browser_view_browsertest.cc

 // Copyright (c) 2011 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 "base/i18n/time_formatting.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/panels/base_panel_browser_test.h"
@@ skipping 223 matching lines @@
     // Create 2 more panels for more testing.
     Panel* panel2 = CreatePanel("PanelTest2");
     Panel* panel3 = CreatePanel("PanelTest3");
 
     // Test bringing up or down the title-bar of all minimized panels.
     EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state());
     panel3->SetExpansionState(Panel::MINIMIZED);
     EXPECT_EQ(Panel::MINIMIZED, panel3->expansion_state());
     EXPECT_EQ(2, panel_manager->minimized_panel_count());
 
-    mock_auto_hiding_desktop_bar()->SetVisibility(
-        AutoHidingDesktopBar::ALIGN_BOTTOM, AutoHidingDesktopBar::VISIBLE);
-    panel_manager->BringUpOrDownTitlebars(true);
-    MessageLoopForUI::current()->RunAllPending();
-    EXPECT_EQ(Panel::TITLE_ONLY, panel1->expansion_state());
-    EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state());
-    EXPECT_EQ(Panel::TITLE_ONLY, panel3->expansion_state());
-    EXPECT_EQ(2, panel_manager->minimized_panel_count());
+    {
+      mock_auto_hiding_desktop_bar()->SetVisibility(
+          AutoHidingDesktopBar::ALIGN_BOTTOM, AutoHidingDesktopBar::VISIBLE);
 
-    mock_auto_hiding_desktop_bar()->SetVisibility(
-        AutoHidingDesktopBar::ALIGN_BOTTOM, AutoHidingDesktopBar::HIDDEN);
-    panel_manager->BringUpOrDownTitlebars(false);
-    MessageLoopForUI::current()->RunAllPending();
-    EXPECT_EQ(Panel::MINIMIZED, panel1->expansion_state());
-    EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state());
-    EXPECT_EQ(Panel::MINIMIZED, panel3->expansion_state());
-    EXPECT_EQ(2, panel_manager->minimized_panel_count());
+      ui_test_utils::WindowedNotificationObserver signal(
+          chrome::NOTIFICATION_PANEL_CHANGED_EXPANSION_STATE,
+          content::Source<Panel>(panel1));
+      panel_manager->BringUpOrDownTitlebars(true);
+      signal.Wait();
+
+      EXPECT_EQ(Panel::TITLE_ONLY, panel1->expansion_state());
+      EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state());
+      EXPECT_EQ(Panel::TITLE_ONLY, panel3->expansion_state());
+      EXPECT_EQ(2, panel_manager->minimized_panel_count());
+    }
+
+    {
+      mock_auto_hiding_desktop_bar()->SetVisibility(
+          AutoHidingDesktopBar::ALIGN_BOTTOM, AutoHidingDesktopBar::HIDDEN);
+
+      ui_test_utils::WindowedNotificationObserver signal(
+          chrome::NOTIFICATION_PANEL_CHANGED_EXPANSION_STATE,
+          content::Source<Panel>(panel1));
+      panel_manager->BringUpOrDownTitlebars(false);
+      signal.Wait();
+
+      EXPECT_EQ(Panel::MINIMIZED, panel1->expansion_state());
+      EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state());
+      EXPECT_EQ(Panel::MINIMIZED, panel3->expansion_state());
+      EXPECT_EQ(2, panel_manager->minimized_panel_count());
+    }
 
     // Test if it is OK to bring up title-bar given the mouse position.
     EXPECT_TRUE(panel_manager->ShouldBringUpTitlebars(
         panel1->GetBounds().x(), panel1->GetBounds().y()));
     EXPECT_FALSE(panel_manager->ShouldBringUpTitlebars(
         panel2->GetBounds().x(), panel2->GetBounds().y()));
     EXPECT_TRUE(panel_manager->ShouldBringUpTitlebars(
         panel3->GetBounds().right() - 1, panel3->GetBounds().bottom() - 1));
     EXPECT_TRUE(panel_manager->ShouldBringUpTitlebars(
         panel3->GetBounds().right() - 1, panel3->GetBounds().bottom() + 10));
@@ skipping 308 matching lines @@
 
 // TODO(jianli): Investigate why this fails on win trunk build.
 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, DISABLED_DrawAttention) {
   TestDrawAttention();
 }
 
 IN_PROC_BROWSER_TEST_F(PanelBrowserViewTest, ChangeAutoHideTaskBarThickness) {
   TestChangeAutoHideTaskBarThickness();
 }
 #endif