Fix flaky linux panel tests related to active state checks

chrome/browser/ui/panels/old_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/utf_string_conversions.h"
 #include "chrome/browser/download/download_service.h"
 #include "chrome/browser/download/download_service_factory.h"
 #include "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/prefs/browser_prefs.h"
@@ skipping 238 matching lines @@
 
     // The below could be separate tests, just adding a TODO here for tracking.
     // TODO(prasadt): Add test for dragging when in titlebar exposed state.
     // TODO(prasadt): Add test in presence of auto hiding task bar.
 
     for (size_t i = 0; i < panels.size(); ++i)
       delete native_panels_testing[i];
   }
 };
 
-// http://crbug.com/135377
-#if defined(OS_LINUX)
-#define MAYBE_CheckDockedPanelProperties DISABLED_CheckDockedPanelProperties
-#else
-#define MAYBE_CheckDockedPanelProperties CheckDockedPanelProperties
-#endif
-
-IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, MAYBE_CheckDockedPanelProperties) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, CheckDockedPanelProperties) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   DockedPanelStrip* docked_strip = panel_manager->docked_strip();
 
   // Create 3 docked panels that are in expanded, title-only or minimized states
   // respectively.
   Panel* panel1 = CreatePanelWithBounds("1", gfx::Rect(0, 0, 100, 100));
   Panel* panel2 = CreatePanelWithBounds("2", gfx::Rect(0, 0, 100, 100));
   panel2->SetExpansionState(Panel::TITLE_ONLY);
   WaitForExpansionStateChanged(panel2, Panel::TITLE_ONLY);
   Panel* panel3 = CreatePanelWithBounds("3", gfx::Rect(0, 0, 100, 100));
@@ skipping 40 matching lines @@
   EXPECT_EQ(panel::NOT_RESIZABLE, panel2->CanResizeByMouse());
   EXPECT_EQ(panel::NOT_RESIZABLE, panel3->CanResizeByMouse());
 
   EXPECT_EQ(Panel::USE_PANEL_ATTENTION, panel1->attention_mode());
   EXPECT_EQ(Panel::USE_PANEL_ATTENTION, panel2->attention_mode());
   EXPECT_EQ(Panel::USE_PANEL_ATTENTION, panel3->attention_mode());
 
   panel_manager->CloseAll();
 }
 
-// http://crbug.com/135377
-#if defined(OS_LINUX)
-#define MAYBE_CreatePanel DISABLED_CreatePanel
-#else
-#define MAYBE_CreatePanel CreatePanel
-#endif
-
-IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, MAYBE_CreatePanel) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, CreatePanel) {
   PanelManager* panel_manager = PanelManager::GetInstance();
   EXPECT_EQ(0, panel_manager->num_panels()); // No panels initially.
 
   Panel* panel = CreatePanel("PanelTest");
   EXPECT_EQ(1, panel_manager->num_panels());
 
   gfx::Rect bounds = panel->GetBounds();
   EXPECT_GT(bounds.x(), 0);
   EXPECT_GT(bounds.y(), 0);
   EXPECT_GT(bounds.width(), 0);
   EXPECT_GT(bounds.height(), 0);
 
   EXPECT_EQ(bounds.right(),
             panel_manager->docked_strip()->StartingRightPosition());
 
   CloseWindowAndWait(panel);
 
   EXPECT_EQ(0, panel_manager->num_panels());
 }
 
-// http://crbug.com/135377
-#if defined(OS_LINUX)
-#define MAYBE_CreateBigPanel DISABLED_CreateBigPanel
-#else
-#define MAYBE_CreateBigPanel CreateBigPanel
-#endif
-
-IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, MAYBE_CreateBigPanel) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, CreateBigPanel) {
   gfx::Rect work_area = PanelManager::GetInstance()->
       display_settings_provider()->GetDisplayArea();
   Panel* panel = CreatePanelWithBounds("BigPanel", work_area);
   gfx::Rect bounds = panel->GetBounds();
   EXPECT_EQ(panel->max_size().width(), bounds.width());
   EXPECT_LT(bounds.width(), work_area.width());
   EXPECT_EQ(panel->max_size().height(), bounds.height());
   EXPECT_LT(bounds.height(), work_area.height());
   panel->Close();
 }
@@ skipping 92 matching lines @@
   new_size.Enlarge(5, 5);
   new_bounds.set_size(new_size);
   panel->SetBounds(new_bounds);
   EXPECT_EQ(new_bounds.size().width(), panel->GetBounds().width());
   EXPECT_EQ(original_height, panel->GetBounds().height());
   EXPECT_EQ(new_bounds.size(), panel->GetRestoredBounds().size());
 
   panel->Close();
 }
 
-// http://crbug.com/135377
-#if defined(OS_LINUX)
-#define MAYBE_AnimateBounds DISABLED_AnimateBounds
-#else
-#define MAYBE_AnimateBounds AnimateBounds
-#endif
-
-IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, MAYBE_AnimateBounds) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, AnimateBounds) {
   Panel* panel = CreatePanelWithBounds("PanelTest", gfx::Rect(0, 0, 100, 100));
   scoped_ptr<NativePanelTesting> panel_testing(
       CreateNativePanelTesting(panel));
 
   // Set bounds with animation.
   gfx::Rect bounds = gfx::Rect(10, 20, 150, 160);
   panel->SetPanelBounds(bounds);
   EXPECT_TRUE(panel_testing->IsAnimatingBounds());
   WaitForBoundsAnimationFinished(panel);
   EXPECT_FALSE(panel_testing->IsAnimatingBounds());
@@ skipping 493 matching lines @@
   EXPECT_EQ(Panel::MINIMIZED, panel->expansion_state());
 
   panel->Close();
 }
 
 IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, DrawAttentionWhileMinimized) {
   // We'll simulate mouse movements for test.
   PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
   PanelManager::GetInstance()->SetMouseWatcherForTesting(mouse_watcher);
 
   // Create 2 panels so we end up with an inactive panel that can

[dcheng, 2012/07/03 23:04:25]

"Create 2 panels"... hmm!

   // be made to draw attention.
   Panel* panel = CreatePanel("test panel1");
   Panel* panel2 = CreatePanel("test panel2");
-  Panel* panel3 = CreatePanel("test panel2");
+  Panel* panel3 = CreatePanel("test panel3");
 
   scoped_ptr<NativePanelTesting> native_panel_testing(
       CreateNativePanelTesting(panel));
 
   // Test that the attention is drawn and the title-bar is brought up when the
   // minimized panel is drawing attention.
   panel->Minimize();
   WaitForExpansionStateChanged(panel, Panel::MINIMIZED);
   panel->FlashFrame(true);
   EXPECT_TRUE(panel->IsDrawingAttention());
@@ skipping 90 matching lines @@
 
   // Move mouse away and panel should go back to fully minimized state.
   MoveMouseAndWaitForExpansionStateChange(panel1, hover_point);
   EXPECT_EQ(Panel::MINIMIZED, panel1->expansion_state());
   EXPECT_EQ(Panel::MINIMIZED, panel2->expansion_state());
 
   panel1->Close();
   panel2->Close();
 }
 
-// http://crbug.com/135377
-#if defined(OS_LINUX)
-#define MAYBE_DrawAttentionWhenActive DISABLED_DrawAttentionWhenActive
-#else
-#define MAYBE_DrawAttentionWhenActive DrawAttentionWhenActive
-#endif
-
-IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, MAYBE_DrawAttentionWhenActive) {
+IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest, DrawAttentionWhenActive) {
   CreatePanelParams params("Initially Active", gfx::Rect(), SHOW_AS_ACTIVE);
   Panel* panel = CreatePanelWithParams(params);
   scoped_ptr<NativePanelTesting> native_panel_testing(
       CreateNativePanelTesting(panel));
 
   // Test that the attention should not be drawn if the expanded panel is in
   // focus.
   EXPECT_EQ(Panel::EXPANDED, panel->expansion_state());
   EXPECT_TRUE(panel->IsActive());
   EXPECT_FALSE(panel->IsDrawingAttention());
@@ skipping 85 matching lines @@
 
   MessageLoop::current()->RunAllPending();
   WaitForPanelActiveState(panel, SHOW_AS_ACTIVE);
   EXPECT_FALSE(panel->IsDrawingAttention());
   EXPECT_FALSE(native_panel_testing->VerifyDrawingAttention());
 
   panel->Close();
 }
 
 
-// http://crbug.com/135377
-#if defined(OS_LINUX)
-#define MAYBE_MinimizeImmediatelyAfterRestore \
-        DISABLED_MinimizeImmediatelyAfterRestore
-#else
-#define MAYBE_MinimizeImmediatelyAfterRestore MinimizeImmediatelyAfterRestore
-#endif
-
 IN_PROC_BROWSER_TEST_F(OldPanelBrowserTest,
-                       MAYBE_MinimizeImmediatelyAfterRestore) {
+                       MinimizeImmediatelyAfterRestore) {
   CreatePanelParams params("Panel Test", gfx::Rect(), SHOW_AS_ACTIVE);
   Panel* panel = CreatePanelWithParams(params);
   scoped_ptr<NativePanelTesting> native_panel_testing(
       CreateNativePanelTesting(panel));
 
   panel->Minimize();  // this should deactivate.
   MessageLoop::current()->RunAllPending();
   WaitForPanelActiveState(panel, SHOW_AS_INACTIVE);
   EXPECT_EQ(Panel::MINIMIZED, panel->expansion_state());
 
@@ skipping 551 matching lines @@
   Browser* tabbed_browser = browser::FindTabbedBrowser(profile, false);
   EXPECT_EQ(1, tabbed_browser->tab_count());
   ASSERT_TRUE(tabbed_browser->window()->IsDownloadShelfVisible());
   chrome::CloseWindow(tabbed_browser);
 
   EXPECT_EQ(1, panel_browser->tab_count());
   ASSERT_FALSE(panel_browser->window()->IsDownloadShelfVisible());
 
   chrome::CloseWindow(panel_browser);
 }