Improve panel related tests to make them more reliable

chrome/browser/ui/panels/docked_panel_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/docked_panel_collection.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
-#include "chrome/browser/ui/panels/test_panel_collection_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 DockedPanelBrowserTest : public BasePanelBrowserTest {
  public:
   virtual void SetUpOnMainThread() OVERRIDE {
     BasePanelBrowserTest::SetUpOnMainThread();
 
     // All the tests here assume using mocked 800x600 display area for the
@@ skipping 25 matching lines @@
   EXPECT_EQ(panel1->GetBounds().width(), panel1->GetRestoredBounds().width());
   EXPECT_EQ(panel2->GetBounds().width(), panel2->GetRestoredBounds().width());
   EXPECT_EQ(panel3->GetBounds().width(), panel3->GetRestoredBounds().width());
 
   // Create more panels so they start getting squeezed.
   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));
 
-  // Wait for active states to settle.
-  PanelCollectionSqueezeObserver panel7_settled(docked_collection, panel7);
-  panel7_settled.Wait();
-
   // The active panel should be at full width.
   EXPECT_EQ(panel7->GetBounds().width(), panel7->GetRestoredBounds().width());
   EXPECT_GT(panel7->GetBounds().x(), docked_collection->work_area().x());
 
   // The rest of them should be at reduced width.
   EXPECT_LT(panel1->GetBounds().width(), panel1->GetRestoredBounds().width());
   EXPECT_LT(panel2->GetBounds().width(), panel2->GetRestoredBounds().width());
   EXPECT_LT(panel3->GetBounds().width(), panel3->GetRestoredBounds().width());
   EXPECT_LT(panel4->GetBounds().width(), panel4->GetRestoredBounds().width());
   EXPECT_LT(panel5->GetBounds().width(), panel5->GetRestoredBounds().width());
   EXPECT_LT(panel6->GetBounds().width(), panel6->GetRestoredBounds().width());
 
   // Activate a different panel.
   panel2->Activate();
   WaitForPanelActiveState(panel2, SHOW_AS_ACTIVE);
 
-  // Wait for active states to settle.
-  PanelCollectionSqueezeObserver panel2_settled(docked_collection, panel2);
-  panel2_settled.Wait();
-
   // The active panel should be at full width.
   EXPECT_EQ(panel2->GetBounds().width(), panel2->GetRestoredBounds().width());
 
   // The rest of them should be at reduced width.
   EXPECT_LT(panel1->GetBounds().width(), panel1->GetRestoredBounds().width());
   EXPECT_LT(panel3->GetBounds().width(), panel3->GetRestoredBounds().width());
   EXPECT_LT(panel4->GetBounds().width(), panel4->GetRestoredBounds().width());
   EXPECT_LT(panel5->GetBounds().width(), panel5->GetRestoredBounds().width());
   EXPECT_LT(panel6->GetBounds().width(), panel6->GetRestoredBounds().width());
   EXPECT_LT(panel7->GetBounds().width(), panel7->GetRestoredBounds().width());
 
   panel_manager->CloseAll();
 }
 
 // http://crbug.com/143247
 #if !defined(OS_WIN)
 #define MAYBE_SqueezeAndThenSomeMore DISABLED_SqueezeAndThenSomeMore
 #else
 #define MAYBE_SqueezeAndThenSomeMore SqueezeAndThenSomeMore
 #endif
 IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, MAYBE_SqueezeAndThenSomeMore) {
   PanelManager* panel_manager = PanelManager::GetInstance();
-  DockedPanelCollection* docked_collection = panel_manager->docked_collection();
 
   // Create enough docked panels to get into squeezing.
   Panel* panel1 = CreateDockedPanel("1", gfx::Rect(0, 0, 200, 100));
   Panel* panel2 = CreateDockedPanel("2", gfx::Rect(0, 0, 200, 100));
   Panel* panel3 = CreateDockedPanel("3", gfx::Rect(0, 0, 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));
 
-  // Wait for active states to settle.
-  PanelCollectionSqueezeObserver panel6_settled(docked_collection, panel6);
-  panel6_settled.Wait();
+  // The active panel should be at full width.
+  EXPECT_EQ(panel6->GetBounds().width(), panel6->GetRestoredBounds().width());
 
   // Record current widths of some panels.
   int panel_1_width_less_squeezed = panel1->GetBounds().width();
   int panel_2_width_less_squeezed = panel2->GetBounds().width();
   int panel_3_width_less_squeezed = panel3->GetBounds().width();
   int panel_4_width_less_squeezed = panel4->GetBounds().width();
   int panel_5_width_less_squeezed = panel5->GetBounds().width();
 
   // These widths should be reduced.
   EXPECT_LT(panel_1_width_less_squeezed, panel1->GetRestoredBounds().width());
   EXPECT_LT(panel_2_width_less_squeezed, panel2->GetRestoredBounds().width());
   EXPECT_LT(panel_3_width_less_squeezed, panel3->GetRestoredBounds().width());
   EXPECT_LT(panel_4_width_less_squeezed, panel4->GetRestoredBounds().width());
   EXPECT_LT(panel_5_width_less_squeezed, panel5->GetRestoredBounds().width());
 
   Panel* panel7 = CreateDockedPanel("7", gfx::Rect(0, 0, 200, 100));
 
-  // Wait for active states to settle.
-  PanelCollectionSqueezeObserver panel7_settled(docked_collection, panel7);
-  panel7_settled.Wait();
-
   // The active panel should be at full width.
   EXPECT_EQ(panel7->GetBounds().width(), panel7->GetRestoredBounds().width());
 
   // The panels should shrink in width.
   EXPECT_LT(panel1->GetBounds().width(), panel_1_width_less_squeezed);
   EXPECT_LT(panel2->GetBounds().width(), panel_2_width_less_squeezed);
   EXPECT_LT(panel3->GetBounds().width(), panel_3_width_less_squeezed);
   EXPECT_LT(panel4->GetBounds().width(), panel_4_width_less_squeezed);
   EXPECT_LT(panel5->GetBounds().width(), panel_5_width_less_squeezed);
+  EXPECT_LT(panel6->GetBounds().width(), panel6->GetRestoredBounds().width());
 
   panel_manager->CloseAll();
 }
 
 // http://crbug.com/143247
 #if !defined(OS_WIN)
 #define MAYBE_MinimizeSqueezedActive DISABLED_MinimizeSqueezedActive
 #else
 #define MAYBE_MinimizeSqueezedActive MinimizeSqueezedActive
 #endif
 IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, MAYBE_MinimizeSqueezedActive) {
   PanelManager* panel_manager = PanelManager::GetInstance();
-  DockedPanelCollection* docked_collection = panel_manager->docked_collection();
 
   // Create enough docked panels to get into squeezing.
   Panel* panel1 = CreateDockedPanel("1", gfx::Rect(0, 0, 200, 100));
   Panel* panel2 = CreateDockedPanel("2", gfx::Rect(0, 0, 200, 100));
   Panel* panel3 = CreateDockedPanel("3", gfx::Rect(0, 0, 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));
 
-  // Wait for active states to settle.
-  PanelCollectionSqueezeObserver panel7_settled(docked_collection, panel7);
-  panel7_settled.Wait();
-
   // The active panel should be at full width.
   EXPECT_EQ(panel7->GetBounds().width(), panel7->GetRestoredBounds().width());
 
   // The rest of them should be at reduced width.
   EXPECT_LT(panel1->GetBounds().width(), panel1->GetRestoredBounds().width());
   EXPECT_LT(panel2->GetBounds().width(), panel2->GetRestoredBounds().width());
   EXPECT_LT(panel3->GetBounds().width(), panel3->GetRestoredBounds().width());
   EXPECT_LT(panel4->GetBounds().width(), panel4->GetRestoredBounds().width());
   EXPECT_LT(panel5->GetBounds().width(), panel5->GetRestoredBounds().width());
   EXPECT_LT(panel6->GetBounds().width(), panel6->GetRestoredBounds().width());
@@ skipping 24 matching lines @@
 }
 
 // http://crbug.com/143247
 #if !defined(OS_WIN)
 #define MAYBE_CloseSqueezedPanels DISABLED_CloseSqueezedPanels
 #else
 #define MAYBE_CloseSqueezedPanels CloseSqueezedPanels
 #endif
 IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, MAYBE_CloseSqueezedPanels) {
   PanelManager* panel_manager = PanelManager::GetInstance();
-  DockedPanelCollection* docked_collection = panel_manager->docked_collection();
 
   // Create enough docked panels to get into squeezing.
   Panel* panel1 = CreateDockedPanel("1", gfx::Rect(0, 0, 200, 100));
   Panel* panel2 = CreateDockedPanel("2", gfx::Rect(0, 0, 200, 100));
   Panel* panel3 = CreateDockedPanel("3", gfx::Rect(0, 0, 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));
 
-  // Wait for active states to settle.
-  PanelCollectionSqueezeObserver panel7_settled(docked_collection, panel7);
-  panel7_settled.Wait();
-
   // Record current widths of some panels.
   int panel_1_orig_width = panel1->GetBounds().width();
   int panel_2_orig_width = panel2->GetBounds().width();
   int panel_3_orig_width = panel3->GetBounds().width();
   int panel_4_orig_width = panel4->GetBounds().width();
   int panel_5_orig_width = panel5->GetBounds().width();
   int panel_6_orig_width = panel6->GetBounds().width();
   int panel_7_orig_width = panel7->GetBounds().width();
 
   // The active panel should be at full width.
@@ skipping 35 matching lines @@
   CloseWindowAndWait(panel7);
   signal2.Wait();
 
   // We should not have squeezing any more; all panels should be at full width.
   EXPECT_EQ(panel1->GetBounds().width(), panel1->GetRestoredBounds().width());
   EXPECT_EQ(panel4->GetBounds().width(), panel4->GetRestoredBounds().width());
   EXPECT_EQ(panel6->GetBounds().width(), panel6->GetRestoredBounds().width());
 
   panel_manager->CloseAll();
 }