Improve panel related tests to make them more reliable

chrome/browser/ui/panels/docked_panel_browsertest.cc

Index: chrome/browser/ui/panels/docked_panel_browsertest.cc
diff --git a/chrome/browser/ui/panels/docked_panel_browsertest.cc b/chrome/browser/ui/panels/docked_panel_browsertest.cc
index 6d8bba5805179dcb5624594f7b71c4451899cb9c..4ba89b48bae6f4bcaf0f716dd9d52ef41f63f13e 100644
--- a/chrome/browser/ui/panels/docked_panel_browsertest.cc
+++ b/chrome/browser/ui/panels/docked_panel_browsertest.cc
@@ -7,7 +7,6 @@
 #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"
@@ -53,10 +52,6 @@ IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, MAYBE_SqueezePanelsInDock) {
   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());
@@ -73,10 +68,6 @@ IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, MAYBE_SqueezePanelsInDock) {
   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());
 
@@ -99,7 +90,6 @@ IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, MAYBE_SqueezePanelsInDock) {
 #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));
@@ -109,9 +99,8 @@ IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, MAYBE_SqueezeAndThenSomeMore) {
   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();
@@ -129,10 +118,6 @@ IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, MAYBE_SqueezeAndThenSomeMore) {
 
   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());
 
@@ -142,6 +127,7 @@ IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, MAYBE_SqueezeAndThenSomeMore) {
   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();
 }
@@ -154,7 +140,6 @@ IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, MAYBE_SqueezeAndThenSomeMore) {
 #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));
@@ -165,10 +150,6 @@ IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, MAYBE_MinimizeSqueezedActive) {
   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());
 
@@ -213,7 +194,6 @@ IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, MAYBE_MinimizeSqueezedActive) {
 #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));
@@ -224,10 +204,6 @@ IN_PROC_BROWSER_TEST_F(DockedPanelBrowserTest, MAYBE_CloseSqueezedPanels) {
   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();