Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(59)

Unified Diff: chrome/browser/ui/panels/panel_browsertest.cc

Issue 12764018: Improve panel related tests to make them more reliable (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Patch Created 7 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/panels/docked_panel_collection.cc ('k') | chrome/browser/ui/panels/panel_collection.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/panels/panel_browsertest.cc
diff --git a/chrome/browser/ui/panels/panel_browsertest.cc b/chrome/browser/ui/panels/panel_browsertest.cc
index 078e2a97b78748a7ebf3aff57a16f0de6ba1f015..dd9d7b9b1aa2ff1ce2b1faf51024bd9c1b838d4c 100644
--- a/chrome/browser/ui/panels/panel_browsertest.cc
+++ b/chrome/browser/ui/panels/panel_browsertest.cc
@@ -274,10 +274,6 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, CheckDockedPanelProperties) {
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));
@@ -914,7 +910,6 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, ChangeAutoHideTaskBarThickness) {
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,
@@ -933,7 +928,6 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, ChangeAutoHideTaskBarThickness) {
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,
@@ -1390,20 +1384,9 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MAYBE_CreateInactiveSwitchToActive) {
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);
@@ -1421,12 +1404,10 @@ IN_PROC_BROWSER_TEST_F(PanelBrowserTest,
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());
« no previous file with comments | « chrome/browser/ui/panels/docked_panel_collection.cc ('k') | chrome/browser/ui/panels/panel_collection.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698