Use correct restore bounds in resizer.

ash/wm/workspace/workspace_window_resizer_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/wm/workspace/workspace_window_resizer.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/display/mouse_cursor_event_filter.h"
 #include "ash/root_window_controller.h"
 #include "ash/screen_ash.h"
@@ skipping 456 matching lines @@
     ASSERT_TRUE(resizer.get());
     resizer->Drag(CalculateDragPoint(*resizer, 0, 10), 0);
     resizer->CompleteDrag(0);
     EXPECT_EQ("0,0 720x" + base::IntToString(bottom),
               window_->bounds().ToString());
     ASSERT_TRUE(GetRestoreBoundsInScreen(window_.get()));
     EXPECT_EQ("20,30 50x60",
               GetRestoreBoundsInScreen(window_.get())->ToString());
   }
   // Try the same with the right side.
-  scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
-      window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
-  ASSERT_TRUE(resizer.get());
-  resizer->Drag(CalculateDragPoint(*resizer, 800, 10), 0);
-  resizer->CompleteDrag(0);
-  EXPECT_EQ("80,0 720x" + base::IntToString(bottom),
-            window_->bounds().ToString());
-  ASSERT_TRUE(GetRestoreBoundsInScreen(window_.get()));
-  EXPECT_EQ("20,30 50x60", GetRestoreBoundsInScreen(window_.get())->ToString());
+  {
+    scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
+        window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
+    ASSERT_TRUE(resizer.get());
+    resizer->Drag(CalculateDragPoint(*resizer, 800, 10), 0);
+    resizer->CompleteDrag(0);
+    EXPECT_EQ("80,0 720x" + base::IntToString(bottom),
+              window_->bounds().ToString());
+    ASSERT_TRUE(GetRestoreBoundsInScreen(window_.get()));
+    EXPECT_EQ("20,30 50x60",
+              GetRestoreBoundsInScreen(window_.get())->ToString());
+  }
+
+  // Test if the restore bounds is correct in multiple displays.
+  ClearRestoreBounds(window_.get());
+  UpdateDisplay("800x600,200x600");
+  Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
+  EXPECT_EQ(root_windows[0], window_->GetRootWindow());
+  window_->SetBoundsInScreen(gfx::Rect(800, 10, 50, 60),
+                             ScreenAsh::GetSecondaryDisplay());
+  EXPECT_EQ(root_windows[1], window_->GetRootWindow());
+  {
+    bottom =
+        ScreenAsh::GetDisplayWorkAreaBoundsInParent(window_.get()).bottom();
+    EXPECT_EQ("800,10 50x60", window_->GetBoundsInScreen().ToString());
+
+    scoped_ptr<WorkspaceWindowResizer> resizer(WorkspaceWindowResizer::Create(
+        window_.get(), gfx::Point(), HTCAPTION, empty_windows()));
+    ASSERT_TRUE(resizer.get());
+
+    resizer->Drag(CalculateDragPoint(*resizer, 199, 00), 0);
+    resizer->CompleteDrag(0);
+    EXPECT_EQ("20,0 180x" + base::IntToString(bottom),
+              window_->bounds().ToString());
+    EXPECT_EQ("800,10 50x60",
+              GetRestoreBoundsInScreen(window_.get())->ToString());
+  }
 }
 
 // Verifies a window can be moved from the primary display to another.
 TEST_F(WorkspaceWindowResizerTest, MAYBE_WindowDragWithMultiDisplays) {
   // The secondary display is logically on the right, but on the system (e.g. X)
   // layer, it's below the primary one. See UpdateDisplay() in ash_test_base.cc.
   UpdateDisplay("800x600,800x600");
   shelf_layout_manager()->LayoutShelf();
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   ASSERT_EQ(2U, root_windows.size());
@@ skipping 878 matching lines @@
     event_filter->WarpMouseCursorIfNecessary(root_windows[1],
                                              gfx::Point(400, 200));
     EXPECT_EQ(1.0f, cursor_test_api.GetDeviceScaleFactor());
     resizer->CompleteDrag(0);
     EXPECT_EQ(1.0f, cursor_test_api.GetDeviceScaleFactor());
   }
 }
 
 }  // namespace internal
 }  // namespace ash