Fix bug 141013: OldPanelBrowserTest.CheckDockedPanelProperties is flaky

chrome/browser/ui/panels/old_panel_browsertest.cc

Index: chrome/browser/ui/panels/old_panel_browsertest.cc
diff --git a/chrome/browser/ui/panels/old_panel_browsertest.cc b/chrome/browser/ui/panels/old_panel_browsertest.cc
index f8161454aad81d876e8883b234c38cb63e0eefd9..d671a6961988ab749e05e4eb120f0d35c40407b9 100644
--- a/chrome/browser/ui/panels/old_panel_browsertest.cc
+++ b/chrome/browser/ui/panels/old_panel_browsertest.cc
@@ -257,16 +257,15 @@ class OldPanelBrowserTest : public OldBasePanelBrowserTest {
   }
 };
 
-// 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));