Desktop aura: Break aura::Window::SetParent in two.

ash/wm/workspace/workspace_layout_manager_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_layout_manager.h"
 
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/wm/property_util.h"
 #include "ash/wm/shelf_layout_manager.h"
 #include "ash/wm/window_util.h"
+#include "ui/aura/client/aura_constants.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/insets.h"
 
 namespace ash {
 
 namespace {
 
 class WorkspaceLayoutManagerTest : public test::AshTestBase {
  public:
   WorkspaceLayoutManagerTest() {}
   virtual ~WorkspaceLayoutManagerTest() {}
 
   aura::Window* CreateTestWindow(const gfx::Rect& bounds) {
-    return aura::test::CreateTestWindowWithBounds(bounds, NULL);
+    aura::Window* window = new aura::Window(NULL);
+    window->SetType(aura::client::WINDOW_TYPE_NORMAL);
+    window->Init(ui::LAYER_TEXTURED);
+    window->SetBounds(bounds);
+    window->Show();
+    window->SetProperty(aura::client::kCanMaximizeKey, true);
+    AddToRootWindow(window);
+    return window;
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WorkspaceLayoutManagerTest);
 };
 
 // Verifies that a window containing a restore coordinate will be restored to
 // to the size prior to minimize, keeping the restore rectangle in tact (if
 // there is one).
 TEST_F(WorkspaceLayoutManagerTest, RestoreFromMinimizeKeepsRestore) {
@@ skipping 46 matching lines @@
 // doesn't effect the restore bounds.
 TEST_F(WorkspaceLayoutManagerTest, DontClobberRestoreBounds) {
   DontClobberRestoreBoundsWindowObserver window_observer;
   scoped_ptr<aura::Window> window(new aura::Window(NULL));
   window->SetType(aura::client::WINDOW_TYPE_NORMAL);
   window->Init(ui::LAYER_TEXTURED);
   window->SetBounds(gfx::Rect(10, 20, 30, 40));
   // NOTE: for this test to exercise the failure the observer needs to be added
   // before the parent set. This mimics what BrowserFrameAura does.
   window->AddObserver(&window_observer);
-  window->SetParent(NULL);
+  AddToRootWindow(window.get());
   window->Show();
   ash::wm::ActivateWindow(window.get());
 
   scoped_ptr<aura::Window> window2(CreateTestWindow(gfx::Rect(12, 20, 30, 40)));
   window->AddTransientChild(window2.get());
   window2->Show();
 
   window_observer.set_window(window2.get());
   wm::MaximizeWindow(window.get());
   EXPECT_EQ("10,20 30x40", GetRestoreBoundsInScreen(window.get())->ToString());
@@ skipping 43 matching lines @@
 
   // Directly setting the bounds triggers a slightly different code path. Verify
   // that too.
   window->SetBounds(window_bounds);
   EXPECT_EQ(gfx::Rect(gfx::Point(100, 101), work_area).ToString(),
       window->bounds().ToString());
 }
 
 }  // namespace
 }  // namespace ash