Fix bug 141013: OldPanelBrowserTest.CheckDockedPanelProperties is flaky

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 239 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/141013
-#if defined(OS_WIN)
-#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();
 
+  // Don't let actual mouse movements affect this test as that may affect

[jennb, 2012/08/08 22:04:08]

Do you need to make the same change to
PanelBrowserTest.CheckDockedPanelProperties?  Is this the cause of the other
tests flaking wrt expansion state? If so, should we always use a
TestPanelMouseWatcher for all panel browser tests by putting that change in
[Old]BasePanelBrowserTest?

[jianli, 2012/08/08 22:28:55]

Done.

+  // minimized vs title-only state.
+  PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
+  panel_manager->SetMouseWatcherForTesting(mouse_watcher);
+
   // 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));
   panel3->SetExpansionState(Panel::MINIMIZED);
   WaitForExpansionStateChanged(panel3, Panel::MINIMIZED);
   scoped_ptr<NativePanelTesting> panel1_testing(
@@ skipping 1252 matching lines @@
   EXPECT_GE(smaller_work_area_size.width(), panel->max_size().width());
   EXPECT_EQ(smaller_work_area_size.height(), panel->max_size().height());
   EXPECT_GT(old_full_size.width(), panel->full_size().width());
   EXPECT_GT(old_full_size.height(), panel->full_size().height());
   EXPECT_GE(panel->max_size().width(), panel->full_size().width());
   EXPECT_GE(panel->max_size().height(), panel->full_size().height());
   EXPECT_EQ(smaller_work_area_size.height(), panel->full_size().height());
 
   panel->Close();
 }