Adding new window management

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 "chrome/browser/ui/window_sizer/window_sizer.h"
 
 #include <vector>
 
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 47 matching lines @@
 // it.
 class TestBrowserWindowAura : public TestBrowserWindow {
  public:
   explicit TestBrowserWindowAura(aura::Window* native_window);
   virtual ~TestBrowserWindowAura();
 
   virtual gfx::NativeWindow GetNativeWindow() OVERRIDE {
     return native_window_;
   }
 
+  virtual gfx::Rect GetBounds() const {
+    return native_window_->bounds();
+  }
+
  private:
   gfx::NativeWindow native_window_;
 
   DISALLOW_COPY_AND_ASSIGN(TestBrowserWindowAura);
 };
 
 } // namespace
 
 TestBrowserWindowAura::TestBrowserWindowAura(aura::Window *native_window)
     : native_window_(native_window) {
@@ skipping 134 matching lines @@
 TEST_F(WindowSizerTest, LastWindowBoundsCase) {
   { // normal, in the middle of the screen somewhere.
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(WindowSizer::kDesktopBorderSize,
                               WindowSizer::kDesktopBorderSize, 500, 400),
                     gfx::Rect(), LAST_ACTIVE, &window_bounds, NULL,
                     gfx::Rect());
     EXPECT_EQ(gfx::Rect(kWindowTilePixels + WindowSizer::kDesktopBorderSize,
                         kWindowTilePixels + WindowSizer::kDesktopBorderSize,
-                        500, 400),
-              window_bounds);
+                        500, 400).ToString(),
+              window_bounds.ToString());
   }
 
   { // taskbar on top.
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, taskbar_top_work_area, gfx::Rect(),
                     gfx::Rect(WindowSizer::kDesktopBorderSize,
                               WindowSizer::kDesktopBorderSize, 500, 400),
                     gfx::Rect(), LAST_ACTIVE, &window_bounds, NULL,
                     gfx::Rect());
     EXPECT_EQ(gfx::Rect(kWindowTilePixels + WindowSizer::kDesktopBorderSize,
                         std::max(kWindowTilePixels +
                                  WindowSizer::kDesktopBorderSize,
                                  34 /* toolbar height */),
-                        500, 400), window_bounds);
+                        500, 400).ToString(), window_bounds.ToString());
   }
 
   { // Too small to satisify the minimum visibility condition.
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(WindowSizer::kDesktopBorderSize,
                               WindowSizer::kDesktopBorderSize, 29, 29),
                     gfx::Rect(), LAST_ACTIVE, &window_bounds, NULL,
                     gfx::Rect());
     EXPECT_EQ(gfx::Rect(kWindowTilePixels + WindowSizer::kDesktopBorderSize,
                         kWindowTilePixels + WindowSizer::kDesktopBorderSize,
                         30 /* not 29 */,
-                        30 /* not 29 */),
-              window_bounds);
+                        30 /* not 29 */).ToString(),
+              window_bounds.ToString());
   }
 
 
   { // Normal.
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(WindowSizer::kDesktopBorderSize,
                               WindowSizer::kDesktopBorderSize, 500, 400),
                     gfx::Rect(), LAST_ACTIVE, &window_bounds, NULL,
                     gfx::Rect());
     EXPECT_EQ(gfx::Rect(kWindowTilePixels + WindowSizer::kDesktopBorderSize,
                         kWindowTilePixels + WindowSizer::kDesktopBorderSize,
-                        500, 400),
-              window_bounds);
+                        500, 400).ToString(),
+              window_bounds.ToString());
   }
 }
 
 // Test that the window opened is sized appropriately given persisted sizes.
 TEST_F(WindowSizerTest, PersistedBoundsCase) {
   { // normal, in the middle of the screen somewhere.
     gfx::Rect initial_bounds(WindowSizer::kDesktopBorderSize,
                              WindowSizer::kDesktopBorderSize, 500, 400);
 
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(), initial_bounds,
                     gfx::Rect(), PERSISTED, &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(initial_bounds, window_bounds);
+    EXPECT_EQ(initial_bounds.ToString(), window_bounds.ToString());
   }
 
   { // Normal.
     gfx::Rect initial_bounds(0, 0, 1024, 768);
 
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(), initial_bounds,
                     gfx::Rect(), PERSISTED, &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(initial_bounds, window_bounds);
+    EXPECT_EQ(initial_bounds.ToString(), window_bounds.ToString());
   }
 
   { // normal, on non-primary monitor in negative coords.
     gfx::Rect initial_bounds(-600, 10, 500, 400);
 
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, left_nonprimary,
                     initial_bounds, gfx::Rect(), PERSISTED, &window_bounds,
                     NULL, gfx::Rect());
-    EXPECT_EQ(initial_bounds, window_bounds);
+    EXPECT_EQ(initial_bounds.ToString(), window_bounds.ToString());
   }
 
   { // normal, on non-primary monitor in negative coords.
     gfx::Rect initial_bounds(-1024, 0, 1024, 768);
 
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, left_nonprimary,
                     initial_bounds, gfx::Rect(), PERSISTED, &window_bounds,
                     NULL, gfx::Rect());
-    EXPECT_EQ(initial_bounds, window_bounds);
+    EXPECT_EQ(initial_bounds.ToString(), window_bounds.ToString());
   }
 
   { // Non-primary monitor resoultion has changed, but the monitor still
     // completely contains the window.
 
     gfx::Rect initial_bounds(1074, 50, 600, 500);
 
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(1024, 0, 800, 600),
                     initial_bounds, right_nonprimary, PERSISTED,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(initial_bounds, window_bounds);
+    EXPECT_EQ(initial_bounds.ToString(), window_bounds.ToString());
   }
 
   { // Non-primary monitor resoultion has changed, and the window is partially
     // off-screen.
 
     gfx::Rect initial_bounds(1274, 50, 600, 500);
 
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(1024, 0, 800, 600),
                     initial_bounds, right_nonprimary, PERSISTED,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(gfx::Rect(1224, 50, 600, 500), window_bounds);
+    EXPECT_EQ("1224,50 600x500", window_bounds.ToString());
   }
 
   { // Non-primary monitor resoultion has changed, and the window is now too
     // large for the monitor.
 
     gfx::Rect initial_bounds(1274, 50, 900, 700);
 
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(1024, 0, 800, 600),
                     initial_bounds, right_nonprimary, PERSISTED,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(gfx::Rect(1024, 0, 800, 600), window_bounds);
+    EXPECT_EQ("1024,0 800x600", window_bounds.ToString());
   }
 
   { // width and height too small
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(WindowSizer::kDesktopBorderSize,
                               WindowSizer::kDesktopBorderSize, 29, 29),
                     gfx::Rect(), PERSISTED, &window_bounds, NULL, gfx::Rect());
     EXPECT_EQ(gfx::Rect(WindowSizer::kDesktopBorderSize,
                         WindowSizer::kDesktopBorderSize,
-                        30 /* not 29 */, 30 /* not 29 */),
-              window_bounds);
+                        30 /* not 29 */, 30 /* not 29 */).ToString(),
+              window_bounds.ToString());
   }
 }
 
 //////////////////////////////////////////////////////////////////////////////
 // The following unittests have different results on Mac/non-Mac because we
 // reposition windows aggressively on Mac.  The *WithAggressiveReposition tests
 // are run on Mac, and the *WithNonAggressiveRepositioning tests are run on
 // other platforms.
 
 TEST_F(WindowSizerTest, LastWindowOffscreenWithNonAggressiveRepositioning) {
   { // taskbar on left.
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, taskbar_left_work_area, gfx::Rect(),
                     gfx::Rect(WindowSizer::kDesktopBorderSize,
                               WindowSizer::kDesktopBorderSize, 500, 400),
                     gfx::Rect(), LAST_ACTIVE, &window_bounds, NULL,
                     gfx::Rect());
     EXPECT_EQ(gfx::Rect(kWindowTilePixels + WindowSizer::kDesktopBorderSize,
                         kWindowTilePixels + WindowSizer::kDesktopBorderSize,
-                        500, 400),
-              window_bounds);
+                        500, 400).ToString(),
+              window_bounds.ToString());
   }
 
   { // offset would put the new window offscreen at the bottom but the minimum
     // visibility condition is barely satisfied without relocation.
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(10, 728, 500, 400), gfx::Rect(), LAST_ACTIVE,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(gfx::Rect(10 + kWindowTilePixels, 738,
-                        500, 400), window_bounds);
+    EXPECT_EQ(gfx::Rect(10 + kWindowTilePixels, 738, 500, 400).ToString(),
+              window_bounds.ToString());
   }
 
   { // offset would put the new window offscreen at the bottom and the minimum
     // visibility condition is satisified by relocation.
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(10, 729, 500, 400), gfx::Rect(), LAST_ACTIVE,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(gfx::Rect(10 + kWindowTilePixels, 738 /* not 739 */, 500, 400),
-              window_bounds);
+    EXPECT_EQ(gfx::Rect(10 + kWindowTilePixels,
+                        738 /* not 739 */,
+                        500,
+                        400).ToString(),
+              window_bounds.ToString());
   }
 
   { // offset would put the new window offscreen at the right but the minimum
     // visibility condition is barely satisfied without relocation.
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(984, 10, 500, 400), gfx::Rect(), LAST_ACTIVE,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(gfx::Rect(994, 10 + kWindowTilePixels, 500, 400), window_bounds);
+    EXPECT_EQ(gfx::Rect(994, 10 + kWindowTilePixels, 500, 400).ToString(),
+              window_bounds.ToString());
   }
 
   { // offset would put the new window offscreen at the right and the minimum
     // visibility condition is satisified by relocation.
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(985, 10, 500, 400), gfx::Rect(), LAST_ACTIVE,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(gfx::Rect(994 /* not 995 */, 10 + kWindowTilePixels,
-                        500, 400), window_bounds);
+    EXPECT_EQ(gfx::Rect(994 /* not 995 */,
+                        10 + kWindowTilePixels,
+                        500,
+                        400).ToString(),
+              window_bounds.ToString());
   }
 
   { // offset would put the new window offscreen at the bottom right and the
     // minimum visibility condition is satisified by relocation.
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(985, 729, 500, 400), gfx::Rect(), LAST_ACTIVE,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(gfx::Rect(994 /* not 995 */, 738 /* not 739 */, 500, 400),
-              window_bounds);
+    EXPECT_EQ(gfx::Rect(994 /* not 995 */,
+                        738 /* not 739 */,
+                        500,
+                        400).ToString(),
+              window_bounds.ToString());
   }
 }
 
 TEST_F(WindowSizerTest,
        PersistedWindowOffscreenWithNonAggressiveRepositioning) {
   { // off the left but the minimum visibility condition is barely satisfied
     // without relocaiton.
     gfx::Rect initial_bounds(-470, 50, 500, 400);
 
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     initial_bounds, gfx::Rect(), PERSISTED,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(initial_bounds, window_bounds);
+    EXPECT_EQ(initial_bounds.ToString(), window_bounds.ToString());
   }
 
   { // off the left and the minimum visibility condition is satisfied by
     // relocation.
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(-471, 50, 500, 400), gfx::Rect(), PERSISTED,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(gfx::Rect(-470 /* not -471 */, 50, 500, 400), window_bounds);
+    EXPECT_EQ(gfx::Rect(-470 /* not -471 */, 50, 500, 400).ToString(),
+              window_bounds.ToString());
   }
 
   { // off the top
     gfx::Rect initial_bounds(50, -370, 500, 400);
 
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(50, -370, 500, 400), gfx::Rect(), PERSISTED,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(gfx::Rect(50, 0, 500, 400), window_bounds);
+    EXPECT_EQ("50,0 500x400", window_bounds.ToString());
   }
 
   { // off the right but the minimum visibility condition is barely satisified
     // without relocation.
     gfx::Rect initial_bounds(994, 50, 500, 400);
 
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     initial_bounds, gfx::Rect(), PERSISTED,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(initial_bounds, window_bounds);
+    EXPECT_EQ(initial_bounds.ToString(), window_bounds.ToString());
   }
 
   { // off the right and the minimum visibility condition is satisified by
     // relocation.
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(995, 50, 500, 400), gfx::Rect(), PERSISTED,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(gfx::Rect(994 /* not 995 */, 50, 500, 400), window_bounds);
+    EXPECT_EQ(gfx::Rect(994 /* not 995 */, 50, 500, 400).ToString(),
+              window_bounds.ToString());
   }
 
   { // off the bottom but the minimum visibility condition is barely satisified
     // without relocation.
     gfx::Rect initial_bounds(50, 738, 500, 400);
 
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     initial_bounds, gfx::Rect(), PERSISTED,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(initial_bounds, window_bounds);
+    EXPECT_EQ(initial_bounds.ToString(), window_bounds.ToString());
   }
 
   { // off the bottom and the minimum visibility condition is satisified by
     // relocation.
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(50, 739, 500, 400), gfx::Rect(), PERSISTED,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(gfx::Rect(50, 738 /* not 739 */, 500, 400), window_bounds);
+    EXPECT_EQ(gfx::Rect(50, 738 /* not 739 */, 500, 400).ToString(),
+              window_bounds.ToString());
   }
 
   { // off the topleft
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(-471, -371, 500, 400), gfx::Rect(), PERSISTED,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(gfx::Rect(-470 /* not -471 */, 0, 500, 400),
-              window_bounds);
+    EXPECT_EQ(gfx::Rect(-470 /* not -471 */, 0, 500, 400).ToString(),
+              window_bounds.ToString());
   }
 
   { // off the topright and the minimum visibility condition is satisified by
     // relocation.
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(995, -371, 500, 400), gfx::Rect(), PERSISTED,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(gfx::Rect(994 /* not 995 */, 0, 500, 400),
-                        window_bounds);
+    EXPECT_EQ(gfx::Rect(994 /* not 995 */, 0, 500, 400).ToString(),
+              window_bounds.ToString());
   }
 
   { // off the bottomleft and the minimum visibility condition is satisified by
     // relocation.
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(-471, 739, 500, 400), gfx::Rect(), PERSISTED,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(gfx::Rect(-470 /* not -471 */, 738 /* not 739 */, 500, 400),
-                        window_bounds);
+    EXPECT_EQ(gfx::Rect(-470 /* not -471 */,
+                        738 /* not 739 */,
+                        500,
+                        400).ToString(),
+              window_bounds.ToString());
   }
 
   { // off the bottomright and the minimum visibility condition is satisified by
     // relocation.
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(995, 739, 500, 400), gfx::Rect(), PERSISTED,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(gfx::Rect(994 /* not 995 */, 738 /* not 739 */, 500, 400),
-                        window_bounds);
+    EXPECT_EQ(gfx::Rect(994 /* not 995 */,
+                        738 /* not 739 */,
+                        500,
+                        400).ToString(),
+              window_bounds.ToString());
   }
 
   { // entirely off left
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(-700, 50, 500, 400), gfx::Rect(), PERSISTED,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(gfx::Rect(-470 /* not -700 */, 50, 500, 400), window_bounds);
+    EXPECT_EQ(gfx::Rect(-470 /* not -700 */, 50, 500, 400).ToString(),
+              window_bounds.ToString());
   }
 
   { // entirely off left (monitor was detached since last run)
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(-700, 50, 500, 400), left_nonprimary, PERSISTED,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(gfx::Rect(0, 50, 500, 400), window_bounds);
+    EXPECT_EQ("0,50 500x400", window_bounds.ToString());
   }
 
   { // entirely off top
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(50, -500, 500, 400), gfx::Rect(), PERSISTED,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(gfx::Rect(50, 0, 500, 400), window_bounds);
+    EXPECT_EQ("50,0 500x400", window_bounds.ToString());
   }
 
   { // entirely off top (monitor was detached since last run)
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(50, -500, 500, 400), top_nonprimary,
                     PERSISTED, &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(gfx::Rect(50, 0, 500, 400), window_bounds);
+    EXPECT_EQ("50,0 500x400", window_bounds.ToString());
   }
 
   { // entirely off right
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(1200, 50, 500, 400), gfx::Rect(), PERSISTED,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(gfx::Rect(994 /* not 1200 */, 50, 500, 400), window_bounds);
+    EXPECT_EQ(gfx::Rect(994 /* not 1200 */, 50, 500, 400).ToString(),
+              window_bounds.ToString());
   }
 
   { // entirely off right (monitor was detached since last run)
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(1200, 50, 500, 400), right_nonprimary,
                     PERSISTED, &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(gfx::Rect(524, 50, 500, 400), window_bounds);
+    EXPECT_EQ("524,50 500x400", window_bounds.ToString());
   }
 
   { // entirely off bottom
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(50, 800, 500, 400), gfx::Rect(), PERSISTED,
                     &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(gfx::Rect(50, 738 /* not 800 */, 500, 400), window_bounds);
+    EXPECT_EQ(gfx::Rect(50, 738 /* not 800 */, 500, 400).ToString(),
+              window_bounds.ToString());
   }
 
   { // entirely off bottom (monitor was detached since last run)
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(50, 800, 500, 400), bottom_nonprimary,
                     PERSISTED, &window_bounds, NULL, gfx::Rect());
-    EXPECT_EQ(gfx::Rect(50, 368, 500, 400), window_bounds);
+    EXPECT_EQ("50,368 500x400", window_bounds.ToString());
   }
 }
 
-// Test that a newly created window gets positioned over a previously created
-// window.
-TEST_F(WindowSizerTestWithBrowser, PlaceNewWindowOverOldWindow) {
+// Test the placement of newly created windows.
+TEST_F(WindowSizerTestWithBrowser, PlaceNewWindows) {
   // Create a dummy window.
   scoped_ptr<aura::Window> window(
       aura::test::CreateTestWindowWithId(0, NULL));
   window->SetBounds(gfx::Rect(16, 32, 640, 320));
 
   scoped_ptr<aura::Window> popup(
       aura::test::CreateTestWindowWithId(1, NULL));
   popup->SetBounds(gfx::Rect(16, 32, 128, 256));
 
   scoped_ptr<aura::Window> panel(
@@ skipping 29 matching lines @@
   Browser::CreateParams panel_params(Browser::TYPE_POPUP, profile.get());
   panel_params.window = browser_panel.get();
   scoped_ptr<Browser> panel_owning_browser(new Browser(panel_params));
 
   window->Show();
   { // With a shown window it's size should get returned.
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(50, 100, 300, 150), bottom_nonprimary,
                     PERSISTED, &window_bounds, browser.get(), gfx::Rect());
-    EXPECT_EQ(gfx::Rect(16, 32, 640, 320), window_bounds);
+    // The position should be right flush.
+    EXPECT_EQ("384,32 640x320", window_bounds.ToString());
+    // In addition the other window should have moved left flush.
+    EXPECT_EQ("0,32 640x320", window->bounds().ToString());
+  }
+
+  { // With the window shown - but more on the right side then on the left
+    // side (and partially out of the screen), it should default to the other
+    // side and inside the screen.
+    window->SetBounds(gfx::Rect(350, 600, 640, 320));
+    gfx::Rect window_bounds;
+    GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
+                    gfx::Rect(50, 100, 300, 150), bottom_nonprimary,
+                    PERSISTED, &window_bounds, browser.get(), gfx::Rect());
+    // The position should be left & bottom flush.
+    EXPECT_EQ("0,448 640x320", window_bounds.ToString());
+    // In addition the other window should have moved right flush.
+    EXPECT_EQ("384,600 640x320", window->bounds().ToString());
+  }
+
+  { // If the second windows right side is already over the right side of the
+    // screen, it will not move back into the screen.
+    window->SetBounds(gfx::Rect(1000, 600, 640, 320));
+    gfx::Rect window_bounds;
+    GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
+                    gfx::Rect(50, 100, 300, 150), bottom_nonprimary,
+                    PERSISTED, &window_bounds, browser.get(), gfx::Rect());
+    // The position should be left & bottom flush.
+    EXPECT_EQ("0,448 640x320", window_bounds.ToString());
+    // If the other window was already beyond the point to get right flush
+    // it will remain where it is.
+    EXPECT_EQ("1000,600 640x320", window->bounds().ToString());
   }
 
   { // Make sure that popups do not get changed.
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(50, 100, 300, 150), bottom_nonprimary,
                     PERSISTED, &window_bounds, popup_owning_browser.get(),
                     gfx::Rect());
-    EXPECT_EQ(gfx::Rect(50, 100, 300, 150), window_bounds);
+    EXPECT_EQ("50,100 300x150", window_bounds.ToString());
   }
 
-  window->SetBounds(gfx::Rect(816, 720, 640, 320));
-  // Verifies newly created windows appear on screen.
-  {
+  window->Hide();
+  { // If a window is there but not shown the persisted default should be used.
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
                     gfx::Rect(50, 100, 300, 150), bottom_nonprimary,
                     PERSISTED, &window_bounds, browser.get(), gfx::Rect());
-    EXPECT_EQ("384,448 640x320", window_bounds.ToString());
+    EXPECT_EQ("50,100 300x150", window_bounds.ToString());
   }
 
-  window->Hide();
   { // If a window is there but not shown the default should be returned.
-    // The existing popup should not have any impact as well.
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(),
-                    gfx::Rect(50, 100, 300, 150), bottom_nonprimary,
-                    PERSISTED, &window_bounds, browser.get(), gfx::Rect());
+                    gfx::Rect(), bottom_nonprimary,
+                    DEFAULT, &window_bounds, browser.get(), gfx::Rect());
     EXPECT_EQ(gfx::Rect(WindowSizer::kDesktopBorderSize,
                         WindowSizer::kDesktopBorderSize,
                         1024 - 2 * WindowSizer::kDesktopBorderSize,
-                        768 - WindowSizer::kDesktopBorderSize),
-                        window_bounds);
+                        768 - WindowSizer::kDesktopBorderSize).ToString(),
+              window_bounds.ToString());
   }
 }
 
 // Test that the window is sized appropriately for the first run experience
 // where the default window bounds calculation is invoked.
 TEST_F(WindowSizerTest, AdjustFitSize) {
   { // Check that the window gets resized to the screen.
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(), gfx::Rect(),
                     gfx::Rect(), DEFAULT, &window_bounds, NULL,
                     gfx::Rect(-10, -10, 1024 + 20, 768 + 20));
-    EXPECT_EQ(gfx::Rect(0, 0, 1024, 768), window_bounds);
+    EXPECT_EQ("0,0 1024x768", window_bounds.ToString());
   }
 
   { // Check that a window which hangs out of the screen get moved back in.
     gfx::Rect window_bounds;
     GetWindowBounds(tentwentyfour, tentwentyfour, gfx::Rect(), gfx::Rect(),
                     gfx::Rect(), DEFAULT, &window_bounds, NULL,
                     gfx::Rect(1020, 700, 100, 100));
-    EXPECT_EQ(gfx::Rect(924, 668, 100, 100), window_bounds);
+    EXPECT_EQ("924,668 100x100", window_bounds.ToString());
   }
 }