Fix bug 141013: OldPanelBrowserTest.CheckDockedPanelProperties is flaky

chrome/browser/ui/panels/old_panel_drag_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/message_loop.h"
 #include "chrome/browser/ui/panels/old_base_panel_browser_test.h"
 #include "chrome/browser/ui/panels/detached_panel_strip.h"
 #include "chrome/browser/ui/panels/docked_panel_strip.h"
 #include "chrome/browser/ui/panels/native_panel.h"
 #include "chrome/browser/ui/panels/panel.h"
 #include "chrome/browser/ui/panels/panel_drag_controller.h"
 #include "chrome/browser/ui/panels/panel_manager.h"
-#include "chrome/browser/ui/panels/test_panel_mouse_watcher.h"
 
 class OldPanelDragBrowserTest : public OldBasePanelBrowserTest {
  public:
   OldPanelDragBrowserTest() : OldBasePanelBrowserTest() {
   }
 
   virtual ~OldPanelDragBrowserTest() {
   }
 
   virtual void SetUpOnMainThread() OVERRIDE {
@@ skipping 372 matching lines @@
 
   panel3_testing->CancelDragTitlebar();
   EXPECT_EQ(position2, panel1->GetBounds().origin());
   EXPECT_EQ(position3, panel2->GetBounds().origin());
   EXPECT_EQ(position1, panel3->GetBounds().origin());
 
   PanelManager::GetInstance()->CloseAll();
 }
 
 IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest, DragMinimizedPanel) {
-  // We'll simulate mouse movements for test.
-  PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
-  PanelManager::GetInstance()->SetMouseWatcherForTesting(mouse_watcher);
-
   Panel* panel = CreatePanel("panel1");
   scoped_ptr<NativePanelTesting> panel_testing(
       CreateNativePanelTesting(panel));
 
   panel->Minimize();
   EXPECT_EQ(Panel::MINIMIZED, panel->expansion_state());
 
   // Hover over minimized panel to bring up titlebar.
   gfx::Point hover_point(panel->GetBounds().origin());
   MoveMouseAndWaitForExpansionStateChange(panel, hover_point);
@@ skipping 19 matching lines @@
   EXPECT_EQ(Panel::TITLE_ONLY, panel->expansion_state());
 
   MoveMouseAndWaitForExpansionStateChange(panel, mouse_location);
   EXPECT_EQ(Panel::MINIMIZED, panel->expansion_state());
 
   panel->Close();
 }
 
 IN_PROC_BROWSER_TEST_F(OldPanelDragBrowserTest,
                        DragMinimizedPanelWhileDrawingAttention) {
-  // We'll simulate mouse movements for test.
-  PanelMouseWatcher* mouse_watcher = new TestPanelMouseWatcher();
-  PanelManager::GetInstance()->SetMouseWatcherForTesting(mouse_watcher);
-
   Panel* panel = CreatePanel("panel1");
   scoped_ptr<NativePanelTesting> panel_testing(
       CreateNativePanelTesting(panel));
   CreatePanel("panel2");
 
   panel->Minimize();
   EXPECT_EQ(Panel::MINIMIZED, panel->expansion_state());
 
   panel->FlashFrame(true);
   EXPECT_TRUE(panel->IsDrawingAttention());
@@ skipping 879 matching lines @@
 
   // Drag down the panel. Expect that the panel can be dragged without
   // constraint.
   drag_to_location = gfx::Point(280, 150);
   DragPanelToMouseLocation(panel, drag_to_location);
   EXPECT_EQ(PanelStrip::DETACHED, panel->panel_strip()->type());
   EXPECT_EQ(drag_to_location, panel->GetBounds().origin());
 
   panel_manager->CloseAll();
 }