Refactor Win panel mouse watcher to use PanelMouseWatcher base class.

chrome/browser/ui/panels/panel_browsertest.cc

 // Copyright (c) 2011 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 "chrome/browser/net/url_request_mock_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
@@ skipping 809 matching lines @@
     MessageLoop::current()->RunAllPending();
   }
   EXPECT_LT(bounds_on_shrink.width(), bounds_on_grow.width());
   EXPECT_GT(bounds_on_shrink.width(), initial_bounds.width());
   EXPECT_EQ(bounds_on_shrink.height(), initial_bounds.height());
 
   panel->Close();
 }
 #endif
 
-#if defined(TOOLKIT_GTK) || defined(OS_MACOSX)
+// TODO(jennb): Disabling for Windows due to failure on XP and Vista.
+#if defined(OS_WIN)
+#define MAYBE_MinimizeRestore DISABLED_MinimizeRestore
+#else
 #define MAYBE_MinimizeRestore MinimizeRestore
-#else
-#define MAYBE_MinimizeRestore DISABLED_MinimizeRestore
 #endif
-
 IN_PROC_BROWSER_TEST_F(PanelBrowserTest, MAYBE_MinimizeRestore) {
   // Disable mouse watcher.  We'll simulate mouse movements for test.
   NativePanelTesting::GetPanelMouseWatcherInstance()->EnableTestingMode();
 
   // Test with one panel.
   CreatePanelWithBounds("PanelTest1", gfx::Rect(0, 0, 100, 100));
   TestMinimizeRestore();
 
   // Test with two panels.
   CreatePanelWithBounds("PanelTest2", gfx::Rect(0, 0, 110, 110));
@@ skipping 172 matching lines @@
   EXPECT_EQ(1, tabbed_browser->tab_count());
   ASSERT_TRUE(tabbed_browser->window()->IsDownloadShelfVisible());
   tabbed_browser->CloseWindow();
 #endif
 
   EXPECT_EQ(1, panel_browser->tab_count());
   ASSERT_FALSE(panel_browser->window()->IsDownloadShelfVisible());
 
   panel_browser->CloseWindow();
 }