Improve panel tests by properly waiting for expected conditions.

chrome/browser/ui/panels/panel_drag_browsertest.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 "base/message_loop.h"
 #include "chrome/browser/ui/panels/base_panel_browser_test.h"
 #include "chrome/browser/ui/panels/detached_panel_strip.h"
 #include "chrome/browser/ui/panels/docked_panel_strip.h"
 #include "chrome/browser/ui/panels/native_panel.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_drag_controller.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
+#include "chrome/browser/ui/panels/test_panel_strip_squeeze_observer.h"
+#include "chrome/common/chrome_notification_types.h"
+#include "content/public/browser/notification_service.h"
+#include "content/public/test/test_utils.h"
 
 class PanelDragBrowserTest : public BasePanelBrowserTest {
  public:
   PanelDragBrowserTest() : BasePanelBrowserTest() {
   }
 
   virtual ~PanelDragBrowserTest() {
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
@@ skipping 1191 matching lines @@
   Panel* panel1 = CreateDetachedPanel("1", gfx::Rect(100, 300, 200, 100));
   Panel* panel2 = CreateDetachedPanel("2", gfx::Rect(200, 300, 200, 100));
   Panel* panel3 = CreateDetachedPanel("3", gfx::Rect(400, 300, 200, 100));
   Panel* panel4 = CreateDockedPanel("4", gfx::Rect(0, 0, 200, 100));
   Panel* panel5 = CreateDockedPanel("5", gfx::Rect(0, 0, 200, 100));
   Panel* panel6 = CreateDockedPanel("6", gfx::Rect(0, 0, 200, 100));
   Panel* panel7 = CreateDockedPanel("7", gfx::Rect(0, 0, 200, 100));
   ASSERT_EQ(3, detached_strip->num_panels());
   ASSERT_EQ(4, docked_strip->num_panels());
 
+  // Wait for active states to settle.
+  PanelStripSqueezeObserver panel7_settled(docked_strip, panel7);
+  panel7_settled.Wait();
+
   gfx::Point detached_position1 = panel1->GetBounds().origin();
   gfx::Point detached_position2 = panel2->GetBounds().origin();
   gfx::Point detached_position3 = panel3->GetBounds().origin();
   gfx::Point docked_position4 = panel4->GetBounds().origin();
   gfx::Point docked_position5 = panel5->GetBounds().origin();
   gfx::Point docked_position6 = panel6->GetBounds().origin();
   gfx::Point docked_position7 = panel7->GetBounds().origin();
 
   // Drag to attach a detached panel between 2 docked panels.
   // Expect to have:
@@ skipping 25 matching lines @@
 
 #if defined(OS_WIN)
   // The panel we dragged becomes the active one.
   EXPECT_EQ(true, panel3->IsActive());
   EXPECT_EQ(panel3->GetBounds().width(), panel3->GetRestoredBounds().width());
 
   EXPECT_NE(docked_position6, panel6->GetBounds().origin());
 #else
   // The last panel is active so these positions do not change.
   // TODO (ABurago) this is wrong behavior, a panel should activate
-  // when it is dragged. Change the test when the behavior is fixed.
+  // when it is dragged (it does in real usage, but not when drag is
+  // simulated in a test). Change this test when the behavior is fixed.
   EXPECT_EQ(true, panel7->IsActive());
   EXPECT_EQ(panel7->GetBounds().width(), panel7->GetRestoredBounds().width());
 
   EXPECT_EQ(docked_position6, panel6->GetBounds().origin());
 #endif
   EXPECT_EQ(docked_position7, panel7->GetBounds().origin());
 
   // Drag to attach a detached panel to most-right.
   // Expect to have:
   //   detached:  P1
@@ skipping 50 matching lines @@
 
   // Drag down the panel. Expect that the panel can be dragged without
   // constraint.
   drag_to_location = gfx::Point(280, 150);
   DragPanelToMouseLocation(panel, drag_to_location);
   EXPECT_EQ(PanelStrip::DETACHED, panel->panel_strip()->type());
   EXPECT_EQ(drag_to_location, panel->GetBounds().origin());
 
   panel_manager->CloseAll();
 }