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

chrome/browser/ui/panels/panel_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/bind.h"
 #include "base/string_number_conversions.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 34 matching lines @@
     signal.Wait();
     // Now we have one less browser instance.
     EXPECT_EQ(browser_count - 1, BrowserList::size());
   }
 
   void MoveMouse(gfx::Point position) {
     PanelManager::GetInstance()->OnMouseMove(position);
     MessageLoopForUI::current()->RunAllPending();
   }
 
+  void MoveMouseAndWiatForExpansionStateChange(Panel* panel,

[jianli, 2011/10/28 21:31:33]

Wiat => Wait

[Dmitry Titov, 2011/10/29 00:04:56]

Done.

+                                               gfx::Point position) {

[jianli, 2011/10/28 21:31:33]

const gfx::Point&

+    ui_test_utils::WindowedNotificationObserver signal(
+        chrome::NOTIFICATION_PANEL_CHANGED_EXPANSION_STATE,
+        content::Source<Panel>(panel));
+    MoveMouse(position);
+    signal.Wait();
+  }
+
   void TestCreatePanelOnOverflow() {
     PanelManager* panel_manager = PanelManager::GetInstance();
     EXPECT_EQ(0, panel_manager->num_panels()); // No panels initially.
 
     // Create testing extensions.
     DictionaryValue empty_value;
     scoped_refptr<Extension> extension1 =
         CreateExtension(FILE_PATH_LITERAL("extension1"),
         Extension::INVALID, empty_value);
     scoped_refptr<Extension> extension2 =
@@ skipping 326 matching lines @@
           test_begin_bounds[index].height() -
           panels[index]->native_panel()->TitleOnlyHeight());
     }
 
     // Test hover.  All panels are currently in minimized state.
     EXPECT_EQ(minimized_states, GetAllPanelExpansionStates());
     for (size_t index = 0; index < panels.size(); ++index) {
       // Hover mouse on minimized panel.
       // Verify titlebar is exposed on all panels.
       gfx::Point hover_point(panels[index]->GetBounds().origin());
-      MoveMouse(hover_point);
+      MoveMouseAndWiatForExpansionStateChange(panels[index], hover_point);
       EXPECT_EQ(titlebar_exposed_bounds, GetAllPanelBounds());
       EXPECT_EQ(titlebar_exposed_states, GetAllPanelExpansionStates());
 
       // Hover mouse above the panel. Verify all panels are minimized.
       hover_point.set_y(
           panels[index]->GetBounds().y() - kFarEnoughFromHoverArea);
-      MoveMouse(hover_point);
+      MoveMouseAndWiatForExpansionStateChange(panels[index], hover_point);
       EXPECT_EQ(minimized_bounds, GetAllPanelBounds());
       EXPECT_EQ(minimized_states, GetAllPanelExpansionStates());
 
       // Hover mouse below minimized panel.
       // Verify titlebar is exposed on all panels.
       hover_point.set_y(panels[index]->GetBounds().y() +
                         panels[index]->GetBounds().height() + 5);
-      MoveMouse(hover_point);
+      MoveMouseAndWiatForExpansionStateChange(panels[index], hover_point);
       EXPECT_EQ(titlebar_exposed_bounds, GetAllPanelBounds());
       EXPECT_EQ(titlebar_exposed_states, GetAllPanelExpansionStates());
 
       // Hover below titlebar exposed panel.  Verify nothing changed.
       hover_point.set_y(panels[index]->GetBounds().y() +
                         panels[index]->GetBounds().height() + 6);
       MoveMouse(hover_point);
       EXPECT_EQ(titlebar_exposed_bounds, GetAllPanelBounds());
       EXPECT_EQ(titlebar_exposed_states, GetAllPanelExpansionStates());
 
       // Hover mouse above panel.  Verify all panels are minimized.
       hover_point.set_y(
           panels[index]->GetBounds().y() - kFarEnoughFromHoverArea);
-      MoveMouse(hover_point);
+      MoveMouseAndWiatForExpansionStateChange(panels[index], hover_point);
       EXPECT_EQ(minimized_bounds, GetAllPanelBounds());
       EXPECT_EQ(minimized_states, GetAllPanelExpansionStates());
     }
 
     // Test restore.  All panels are currently in minimized state.
     for (size_t index = 0; index < panels.size(); ++index) {
       // Hover on the last panel.  This is to test the case of clicking on the
       // panel when it's in titlebar exposed state.
       if (index == panels.size() - 1)
         MoveMouse(minimized_bounds[index].origin());
@@ skipping 1039 matching lines @@
   EXPECT_EQ(1, tabbed_browser->tab_count());
   ASSERT_TRUE(tabbed_browser->window()->IsDownloadShelfVisible());
   tabbed_browser->CloseWindow();
 #endif
 
   EXPECT_EQ(1, panel_browser->tab_count());
   ASSERT_FALSE(panel_browser->window()->IsDownloadShelfVisible());
 
   panel_browser->CloseWindow();
 }