Removes aura dependencies from WindowPositioner

chrome/browser/ui/window_sizer/window_sizer_common_unittest.h

 // 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.
 
 #ifndef CHROME_BROWSER_UI_WINDOW_SIZER_WINDOW_SIZER_COMMON_UNITTEST_H_
 #define CHROME_BROWSER_UI_WINDOW_SIZER_WINDOW_SIZER_COMMON_UNITTEST_H_
 
 #include <vector>
 
 #include "base/logging.h"
@@ skipping 76 matching lines @@
 // window sizer test operations with a single call.
 
 enum Source { DEFAULT, LAST_ACTIVE, PERSISTED, BOTH };
 
 // Sets up the window bounds, monitor bounds, show states and more to get the
 // resulting |out_bounds| and |out_show_state| from the WindowSizer.
 // |source| specifies which type of data gets set for the test: Either the
 // last active window, the persisted value which was stored earlier, both or
 // none. For all these states the |bounds| and |work_area| get used, for the
 // show states either |show_state_persisted| or |show_state_last| will be used.
+// |display_index| is the index of the display to return from
+// GetDisplayNearestWindow(), and is only used on aura.
 void GetWindowBoundsAndShowState(const gfx::Rect& monitor1_bounds,
                                  const gfx::Rect& monitor1_work_area,
                                  const gfx::Rect& monitor2_bounds,
                                  const gfx::Rect& bounds,
                                  const gfx::Rect& work_area,
                                  ui::WindowShowState show_state_persisted,
                                  ui::WindowShowState show_state_last,
                                  Source source,
                                  const Browser* browser,
                                  const gfx::Rect& passed_in,
+                                 size_t display_index,
                                  gfx::Rect* out_bounds,
                                  ui::WindowShowState* out_show_state);
 
 // Sets up the window bounds, monitor bounds, and work area to get the
 // resulting |out_bounds| from the WindowSizer.
 // |source| specifies which type of data gets set for the test: Either the
 // last active window, the persisted value which was stored earlier, both or
 // none. For all these states the |bounds| and |work_area| get used, for the
 // show states either |show_state_persisted| or |show_state_last| will be used.
 void GetWindowBounds(const gfx::Rect& monitor1_bounds,
@@ skipping 12 matching lines @@
 // |source|. The |display_config| is the primary display configuration used.
 ui::WindowShowState GetWindowShowState(
     ui::WindowShowState show_state_persisted,
     ui::WindowShowState show_state_last,
     Source source,
     const Browser* browser,
     const gfx::Rect& bounds,
     const gfx::Rect& display_config);
 
 #endif  // CHROME_BROWSER_UI_WINDOW_SIZER_WINDOW_SIZER_COMMON_UNITTEST_H_