Revert 243986 "Fix AdjustBoundsToEnsureWindowVisibility to work ..."

trunk/src/ash/wm/drag_window_resizer_unittest.cc

Index: trunk/src/ash/wm/drag_window_resizer_unittest.cc
===================================================================
--- trunk/src/ash/wm/drag_window_resizer_unittest.cc	(revision 244019)
+++ trunk/src/ash/wm/drag_window_resizer_unittest.cc	(working copy)
@@ -244,9 +244,12 @@
     gfx::Rect intersect(window_->GetRootWindow()->GetBoundsInScreen());
     intersect.Intersect(window_bounds_in_screen);
 
-    EXPECT_LE(10, intersect.width());
-    EXPECT_LE(10, intersect.height());
-    EXPECT_TRUE(window_bounds_in_screen.Contains(gfx::Point(800, 10)));
+    // 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)));
   }
 
   // Dropping a window that is larger than the destination work area
@@ -513,11 +516,6 @@
   // 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]));