Panel strip refactor cleanup.

chrome/browser/ui/panels/panel_manager.h

Index: chrome/browser/ui/panels/panel_manager.h
diff --git a/chrome/browser/ui/panels/panel_manager.h b/chrome/browser/ui/panels/panel_manager.h
index b78cb9e9b3e9a96ab1ba555589c52f4c50652c42..c36f8c7d592850b5d0e27f5d260e629cd2bd0d74 100644
--- a/chrome/browser/ui/panels/panel_manager.h
+++ b/chrome/browser/ui/panels/panel_manager.h
@@ -15,13 +15,6 @@
 #include "chrome/browser/ui/panels/panel.h"
 #include "ui/gfx/rect.h"
 
-// TODO(jennb): Clean up by removing functions below that cause this
-// to be required.
-#ifdef UNIT_TEST
-#include "chrome/browser/ui/panels/panel_strip.h"
-#include "chrome/browser/ui/panels/panel_mouse_watcher.h"
-#endif
-
 class Browser;
 class PanelMouseWatcher;
 class PanelOverflowStrip;
@@ -75,7 +68,6 @@ class PanelManager : public AutoHidingDesktopBar::Observer {
   BrowserWindow* GetNextBrowserWindowToActivate(Panel* panel) const;
 
   int num_panels() const;
-  bool is_dragging_panel() const;
   int StartingRightPosition() const;
   const Panels& panels() const;
 
@@ -97,35 +89,25 @@ class PanelManager : public AutoHidingDesktopBar::Observer {
   }
 
 #ifdef UNIT_TEST
-  static int horizontal_spacing() { return PanelStrip::horizontal_spacing(); }
-
-  const gfx::Rect& work_area() const {
-    return work_area_;
-  }
-
   void set_auto_hiding_desktop_bar(
       AutoHidingDesktopBar* auto_hiding_desktop_bar) {
     auto_hiding_desktop_bar_ = auto_hiding_desktop_bar;
   }
 
-  void set_mouse_watcher(PanelMouseWatcher* watcher) {
-    panel_mouse_watcher_.reset(watcher);
-  }
-
   void enable_auto_sizing(bool enabled) {
     auto_sizing_enabled_ = enabled;
   }
 
-  void SetWorkAreaForTesting(const gfx::Rect& work_area) {
-    SetWorkArea(work_area);
+  const gfx::Rect& work_area() const {
+    return work_area_;
   }
 
-  void remove_delays_for_testing() {
-    panel_strip_->remove_delays_for_testing();
+  void SetWorkAreaForTesting(const gfx::Rect& work_area) {
+    SetWorkArea(work_area);
   }
 
-  int minimized_panel_count() {
-    return panel_strip_->minimized_panel_count();
+  void SetMouseWatcherForTesting(PanelMouseWatcher* watcher) {
+    SetMouseWatcher(watcher);
   }
 #endif
 
@@ -154,6 +136,9 @@ class PanelManager : public AutoHidingDesktopBar::Observer {
   // Tests if the current active app is in full screen mode.
   void CheckFullScreenMode();
 
+  // Tests may want to use a mock panel mouse watcher.
+  void SetMouseWatcher(PanelMouseWatcher* watcher);
+
   scoped_ptr<PanelStrip> panel_strip_;
   scoped_ptr<PanelOverflowStrip> panel_overflow_strip_;