Fix AdjustBoundsToEnsureWindowVisibility to work with non primary display bounds

ash/wm/drag_window_resizer_unittest.cc

Index: ash/wm/drag_window_resizer_unittest.cc
diff --git a/ash/wm/drag_window_resizer_unittest.cc b/ash/wm/drag_window_resizer_unittest.cc
index fb33a98d1a769e1d8a1c9843e45e73874f2bc8f4..2b92beda1f9eb12891e9d654e5a7099adb2e9f38 100644
--- a/ash/wm/drag_window_resizer_unittest.cc
+++ b/ash/wm/drag_window_resizer_unittest.cc
@@ -244,12 +244,9 @@ TEST_F(DragWindowResizerTest, WindowDragWithMultiDisplays) {
     gfx::Rect intersect(window_->GetRootWindow()->GetBoundsInScreen());
     intersect.Intersect(window_bounds_in_screen);
 
-    // TODO(oshima): Following condition fails without docked window resizer.
-    // Proper fix caused the other failures, so I'm disabling these
-    // for m33 (Which is harmless).
-    // EXPECT_LE(10, intersect.width());
-    // EXPECT_LE(10, intersect.height());
-    // EXPECT_TRUE(window_bounds_in_screen.Contains(gfx::Point(800, 10)));
+    EXPECT_LE(10, intersect.width());
+    EXPECT_LE(10, intersect.height());
+    EXPECT_TRUE(window_bounds_in_screen.Contains(gfx::Point(800, 10)));
   }
 
   // Dropping a window that is larger than the destination work area
@@ -516,6 +513,11 @@ TEST_F(DragWindowResizerTest, CursorDeviceScaleFactor) {
   // Move window from the root window with 2.0 device scale factor to the root
   // window with 1.0 device scale factor.
   {
+    // Make sure the window is on the default container first.
+    aura::Window* default_container =
+        GetRootWindowController(root_windows[1])->GetContainer(
+            internal::kShellWindowId_DefaultContainer);
+    default_container->AddChild(window_.get());
     window_->SetBoundsInScreen(
         gfx::Rect(600, 0, 50, 60),
         Shell::GetScreen()->GetDisplayNearestWindow(root_windows[1]));