Fix bug 141013: OldPanelBrowserTest.CheckDockedPanelProperties is flaky

chrome/browser/ui/panels/old_panel_and_desktop_notification_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/utf_string_conversions.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/notifications/balloon.h"
 #include "chrome/browser/notifications/balloon_collection_impl.h"
 #include "chrome/browser/notifications/desktop_notification_service.h"
 #include "chrome/browser/notifications/notification.h"
 #include "chrome/browser/notifications/notification_ui_manager.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/panels/old_base_panel_browser_test.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
-#include "chrome/browser/ui/panels/test_panel_mouse_watcher.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/common/show_desktop_notification_params.h"
 #include "ui/gfx/screen.h"
 
 // Desktop notification code subscribes to various panel change notifications
 // so that it knows when to adjusts balloon positions. In order to give
 // desktop notification code a chance to process the change notifications,
 // we call MessageLoopForUI::current()->RunAllPending() after any panel change
 // has been made.
 class OldPanelAndDesktopNotificationTest : public OldBasePanelBrowserTest {
@@ skipping 113 matching lines @@
 
 // http://crbug.com/133612
 #if defined(OS_LINUX)
 #define MAYBE_ExpandAndCollapsePanel DISABLED_ExpandAndCollapsePanel
 #else
 #define MAYBE_ExpandAndCollapsePanel ExpandAndCollapsePanel
 #endif
 
 IN_PROC_BROWSER_TEST_F(OldPanelAndDesktopNotificationTest,
                        MAYBE_ExpandAndCollapsePanel) {
-  // Disable mouse watcher since we don't want mouse movements to affect panel
-  // testing for title-only state.
-  PanelManager* panel_manager = PanelManager::GetInstance();
-  PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
-  panel_manager->SetMouseWatcherForTesting(mouse_watcher);
-
   Balloon* balloon = CreateBalloon();
 
   // Create a docked panel. Expect that the notification balloon moves up to be
   // above the panel.
   Panel* panel = CreateDockedPanel("1", gfx::Rect(0, 0, 200, 200));
   MessageLoopForUI::current()->RunAllPending();
   int balloon_bottom_on_expanded = GetBalloonBottomPosition(balloon);
   EXPECT_LT(balloon_bottom_on_expanded, panel->GetBounds().y());
 
   // Minimize the panel. Expect that the notification balloon moves down, but
@@ skipping 248 matching lines @@
   MessageLoopForUI::current()->RunAllPending();
   EXPECT_EQ(balloon_bottom_after_short_panel_created,
             GetBalloonBottomPosition(balloon));
 
   // Close short panel. Expect that the notification balloo moves back to its
   // original position.
   short_panel->Close();
   MessageLoopForUI::current()->RunAllPending();
   EXPECT_EQ(original_balloon_bottom, GetBalloonBottomPosition(balloon));
 }