Removes aura dependencies from WindowPositioner

chrome/browser/ui/window_sizer/window_sizer_ash_unittest.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 "ash/scoped_target_root_window.h"
 #include "ash/screen_util.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/wm/window_positioner.h"
@@ skipping 500 matching lines @@
 
   // A common screen size for Chrome OS devices where this behavior is
   // desirable.
   const gfx::Rect p1366x768(0, 0, 1366, 768);
 
   // If there is no previous state the window should get maximized if the
   // screen is less than or equal to our limit (1366 pixels width).
   gfx::Rect window_bounds;
   ui::WindowShowState out_show_state1 = ui::SHOW_STATE_DEFAULT;
   GetWindowBoundsAndShowState(
-      p1366x768,                    // The screen resolution.
-      p1366x768,                    // The monitor work area.
-      gfx::Rect(),                  // The second monitor.
-      gfx::Rect(),                  // The (persisted) bounds.
-      p1366x768,                    // The overall work area.
-      ui::SHOW_STATE_NORMAL,        // The persisted show state.
-      ui::SHOW_STATE_DEFAULT,       // The last show state.
-      DEFAULT,                      // No persisted values.
-      browser.get(),                // Use this browser.
-      gfx::Rect(),                  // Don't request valid bounds.
-      &window_bounds,
-      &out_show_state1);
+      p1366x768,               // The screen resolution.
+      p1366x768,               // The monitor work area.
+      gfx::Rect(),             // The second monitor.
+      gfx::Rect(),             // The (persisted) bounds.
+      p1366x768,               // The overall work area.
+      ui::SHOW_STATE_NORMAL,   // The persisted show state.
+      ui::SHOW_STATE_DEFAULT,  // The last show state.
+      DEFAULT,                 // No persisted values.
+      browser.get(),           // Use this browser.
+      gfx::Rect(),             // Don't request valid bounds.
+      0u,                      // Display index.
+      &window_bounds, &out_show_state1);
   EXPECT_EQ(ui::SHOW_STATE_MAXIMIZED, out_show_state1);
 
   // If there is a stored coordinate however, that should be taken instead.
   ui::WindowShowState out_show_state2 = ui::SHOW_STATE_DEFAULT;
   GetWindowBoundsAndShowState(
-      p1366x768,                    // The screen resolution.
-      p1366x768,                    // The monitor work area.
-      gfx::Rect(),                  // The second monitor.
-      gfx::Rect(50, 100, 300, 150), // The (persisted) bounds.
-      p1366x768,                    // The overall work area.
-      ui::SHOW_STATE_NORMAL,        // The persisted show state.
-      ui::SHOW_STATE_DEFAULT,       // The last show state.
-      PERSISTED,                    // Set the persisted values.
-      browser.get(),                // Use this browser.
-      gfx::Rect(),                  // Don't request valid bounds.
-      &window_bounds,
-      &out_show_state2);
+      p1366x768,                     // The screen resolution.
+      p1366x768,                     // The monitor work area.
+      gfx::Rect(),                   // The second monitor.
+      gfx::Rect(50, 100, 300, 150),  // The (persisted) bounds.
+      p1366x768,                     // The overall work area.
+      ui::SHOW_STATE_NORMAL,         // The persisted show state.
+      ui::SHOW_STATE_DEFAULT,        // The last show state.
+      PERSISTED,                     // Set the persisted values.
+      browser.get(),                 // Use this browser.
+      gfx::Rect(),                   // Don't request valid bounds.
+      0u,                            // Display index.
+      &window_bounds, &out_show_state2);
   EXPECT_EQ(ui::SHOW_STATE_NORMAL, out_show_state2);
   EXPECT_EQ("50,100 300x150", window_bounds.ToString());
 
   // A larger monitor should not trigger auto-maximize.
   ui::WindowShowState out_show_state3 = ui::SHOW_STATE_DEFAULT;
   GetWindowBoundsAndShowState(
-      p1600x1200,                   // The screen resolution.
-      p1600x1200,                   // The monitor work area.
-      gfx::Rect(),                  // The second monitor.
-      gfx::Rect(),                  // The (persisted) bounds.
-      p1600x1200,                   // The overall work area.
-      ui::SHOW_STATE_NORMAL,        // The persisted show state.
-      ui::SHOW_STATE_DEFAULT,       // The last show state.
-      DEFAULT,                      // No persisted values.
-      browser.get(),                // Use this browser.
-      gfx::Rect(),                  // Don't request valid bounds.
-      &window_bounds,
-      &out_show_state3);
+      p1600x1200,              // The screen resolution.
+      p1600x1200,              // The monitor work area.
+      gfx::Rect(),             // The second monitor.
+      gfx::Rect(),             // The (persisted) bounds.
+      p1600x1200,              // The overall work area.
+      ui::SHOW_STATE_NORMAL,   // The persisted show state.
+      ui::SHOW_STATE_DEFAULT,  // The last show state.
+      DEFAULT,                 // No persisted values.
+      browser.get(),           // Use this browser.
+      gfx::Rect(),             // Don't request valid bounds.
+      0u,                      // Display index.
+      &window_bounds, &out_show_state3);
 #if defined(OS_WIN)
   EXPECT_EQ(ui::SHOW_STATE_MAXIMIZED, out_show_state3);
 #else
   EXPECT_EQ(ui::SHOW_STATE_DEFAULT, out_show_state3);
 #endif
 }
 
 #if defined(OS_CHROMEOS)
 #define MAYBE_PlaceNewWindowsOnMultipleDisplays PlaceNewWindowsOnMultipleDisplays
 #else
@@ skipping 59 matching lines @@
         gfx::Screen::GetScreen()->GetDisplayNearestPoint(
             gfx::Point(1600 + 100, 10));
     browser_window->GetNativeWindow()->SetBoundsInScreen(
         gfx::Rect(secondary_bounds.CenterPoint().x() - 100, 10, 200, 200),
         second_display);
     aura::client::GetActivationClient(native_window->GetRootWindow())
         ->ActivateWindow(native_window);
     EXPECT_NE(ash::Shell::GetPrimaryRootWindow(),
               ash::Shell::GetTargetRootWindow());
     gfx::Rect window_bounds;
-    GetWindowBounds(p1600x1200, p1600x1200, secondary_bounds, gfx::Rect(),
-                    secondary_bounds, PERSISTED, new_browser.get(), gfx::Rect(),
-                    &window_bounds);
+    ui::WindowShowState out_show_state = ui::SHOW_STATE_DEFAULT;
+    GetWindowBoundsAndShowState(
+        p1600x1200, p1600x1200, secondary_bounds, gfx::Rect(), secondary_bounds,
+        ui::SHOW_STATE_DEFAULT, ui::SHOW_STATE_DEFAULT, PERSISTED,
+        new_browser.get(), gfx::Rect(), 1u, &window_bounds, &out_show_state);
     // TODO(oshima): Use exact bounds when the window_sizer_ash is
     // moved to ash and changed to include the result from
     // RearrangeVisibleWindowOnShow.
     EXPECT_TRUE(secondary_bounds.Contains(window_bounds));
   }
 
   // Activate another window in the primary display and create a new window.
   // It should be created in the primary display.
   {
     aura::client::GetActivationClient(another_native_window->GetRootWindow())
@@ skipping 236 matching lines @@
   EXPECT_EQ(
       ui::SHOW_STATE_DEFAULT,
       GetWindowShowState(ui::SHOW_STATE_DEFAULT, ui::SHOW_STATE_NORMAL, BOTH,
                          trusted_popup.get(), p1280x1024, p1600x1200));
   // A popup that is sized to occupy the whole work area has default state.
   EXPECT_EQ(
       ui::SHOW_STATE_DEFAULT,
       GetWindowShowState(ui::SHOW_STATE_DEFAULT, ui::SHOW_STATE_NORMAL, BOTH,
                          trusted_popup.get(), p1600x1200, p1600x1200));
 }