Improve panel related tests to make them more reliable

chrome/browser/ui/panels/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/bind.h"
 #include "base/prefs/pref_service.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/extension_apitest.h"
@@ skipping 256 matching lines @@
   EXPECT_EQ(Panel::TITLE_ONLY, panel2->expansion_state());
   panel3->SetExpansionState(Panel::MINIMIZED);
   EXPECT_EQ(Panel::MINIMIZED, panel3->expansion_state());
   scoped_ptr<NativePanelTesting> panel1_testing(
       CreateNativePanelTesting(panel1));
   scoped_ptr<NativePanelTesting> panel2_testing(
       CreateNativePanelTesting(panel2));
   scoped_ptr<NativePanelTesting> panel3_testing(
       CreateNativePanelTesting(panel3));
 
-  // Ensure that the layout message can get a chance to be processed so that
-  // the button visibility can be updated.
-  MessageLoop::current()->RunUntilIdle();
-
   EXPECT_EQ(3, panel_manager->num_panels());
   EXPECT_TRUE(docked_collection->HasPanel(panel1));
   EXPECT_TRUE(docked_collection->HasPanel(panel2));
   EXPECT_TRUE(docked_collection->HasPanel(panel3));
 
   EXPECT_EQ(Panel::EXPANDED, panel1->expansion_state());
   EXPECT_EQ(Panel::TITLE_ONLY, panel2->expansion_state());
   EXPECT_EQ(Panel::MINIMIZED, panel3->expansion_state());
 
   EXPECT_TRUE(panel1->IsAlwaysOnTop());
@@ skipping 616 matching lines @@
   int bottom_bar_thickness_delta = 10;
   bottom_bar_thickness += bottom_bar_thickness_delta;
   int right_bar_thickness_delta = 15;
   right_bar_thickness += right_bar_thickness_delta;
   mock_display_settings_provider()->SetDesktopBarThickness(
       DisplaySettingsProvider::DESKTOP_BAR_ALIGNED_BOTTOM,
       bottom_bar_thickness);
   mock_display_settings_provider()->SetDesktopBarThickness(
       DisplaySettingsProvider::DESKTOP_BAR_ALIGNED_RIGHT,
       right_bar_thickness);
-  MessageLoopForUI::current()->RunUntilIdle();
   EXPECT_EQ(initial_starting_right_position,
             docked_collection->StartingRightPosition());
   EXPECT_EQ(docked_collection->work_area().bottom() - bottom_bar_thickness,
             panel->GetBounds().bottom());
   EXPECT_EQ(docked_collection->StartingRightPosition(),
             panel->GetBounds().right());
 
   initial_starting_right_position = docked_collection->StartingRightPosition();
   bottom_bar_thickness_delta = 20;
   bottom_bar_thickness -= bottom_bar_thickness_delta;
   right_bar_thickness_delta = 10;
   right_bar_thickness -= right_bar_thickness_delta;
   mock_display_settings_provider()->SetDesktopBarThickness(
       DisplaySettingsProvider::DESKTOP_BAR_ALIGNED_BOTTOM,
       bottom_bar_thickness);
   mock_display_settings_provider()->SetDesktopBarThickness(
       DisplaySettingsProvider::DESKTOP_BAR_ALIGNED_RIGHT,
       right_bar_thickness);
-  MessageLoopForUI::current()->RunUntilIdle();
   EXPECT_EQ(docked_collection->StartingRightPosition(),
             initial_starting_right_position);
   EXPECT_EQ(docked_collection->work_area().bottom() - bottom_bar_thickness,
             panel->GetBounds().bottom());
   EXPECT_EQ(docked_collection->StartingRightPosition(),
             panel->GetBounds().right());
 
   panel->Close();
 }
 
@@ skipping 436 matching lines @@
 
   CreatePanelParams params("Initially Inactive", gfx::Rect(), SHOW_AS_INACTIVE);
   Panel* panel = CreatePanelWithParams(params);
 
   panel->Activate();
   WaitForPanelActiveState(panel, SHOW_AS_ACTIVE);
 
   panel->Close();
 }
 
-// TODO(dimich): try/enable on other platforms. See bug 103253 for details on
-// why this is disabled on windows.
-#if defined(OS_MACOSX)
-#define MAYBE_MinimizeTwoPanelsWithoutTabbedWindow \
-    MinimizeTwoPanelsWithoutTabbedWindow
-#else
-#define MAYBE_MinimizeTwoPanelsWithoutTabbedWindow \
-    DISABLED_MinimizeTwoPanelsWithoutTabbedWindow
-#endif
-
 // When there are 2 panels and no chrome window, minimizing one panel does
 // not expand/focuses another.
-IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
-                       MAYBE_MinimizeTwoPanelsWithoutTabbedWindow) {
+IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MinimizeTwoPanelsWithoutTabbedWindow) {
   CreatePanelParams params("Initially Inactive", gfx::Rect(), SHOW_AS_INACTIVE);
   Panel* panel1 = CreatePanelWithParams(params);
   Panel* panel2 = CreatePanelWithParams(params);
 
   // Close main tabbed window.
   content::WindowedNotificationObserver signal(
       chrome::NOTIFICATION_BROWSER_CLOSED,
       content::Source<Browser>(browser()));
   chrome::CloseWindow(browser());
   signal.Wait();
 
   EXPECT_EQ(Panel::EXPANDED, panel1->expansion_state());
   EXPECT_EQ(Panel::EXPANDED, panel2->expansion_state());
   panel1->Activate();
   WaitForPanelActiveState(panel1, SHOW_AS_ACTIVE);
 
   panel1->SetExpansionState(Panel::MINIMIZED);
-  MessageLoop::current()->RunUntilIdle();
   WaitForPanelActiveState(panel1, SHOW_AS_INACTIVE);
   EXPECT_EQ(Panel::MINIMIZED, panel1->expansion_state());
 
   panel2->SetExpansionState(Panel::MINIMIZED);
-  MessageLoop::current()->RunUntilIdle();
   WaitForPanelActiveState(panel2, SHOW_AS_INACTIVE);
   EXPECT_EQ(Panel::MINIMIZED, panel2->expansion_state());
 
   // Verify that panel1 is still minimized and not active.
   WaitForPanelActiveState(panel1, SHOW_AS_INACTIVE);
   EXPECT_EQ(Panel::MINIMIZED, panel1->expansion_state());
 
   // Another check for the same.
   EXPECT_FALSE(panel1->IsActive());
   EXPECT_FALSE(panel2->IsActive());
@@ skipping 383 matching lines @@
 #else
 #define MAYBE_FocusChangeEventOnMinimize FocusChangeEventOnMinimize
 #endif
 IN_PROC_BROWSER_TEST_F(PanelExtensionApiTest,
                        MAYBE_FocusChangeEventOnMinimize) {
   // This is needed so the subsequently created panels can be activated.
   // On a Mac, it transforms background-only test process into foreground one.
   ASSERT_TRUE(ui_test_utils::BringBrowserWindowToFront(browser()));
   ASSERT_TRUE(RunExtensionTest("panels/focus_change_on_minimize")) << message_;
 }