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

ash/wm/base_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/base_layout_manager.h"
 
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 26 matching lines @@
         gfx::Insets(1, 2, 3, 4));
     Shell::GetPrimaryRootWindow()->SetHostSize(gfx::Size(800, 600));
     aura::Window* default_container = Shell::GetContainer(
         Shell::GetPrimaryRootWindow(),
         internal::kShellWindowId_DefaultContainer);
     default_container->SetLayoutManager(new internal::BaseLayoutManager(
         Shell::GetPrimaryRootWindow()));
   }
 
   aura::Window* CreateTestWindow(const gfx::Rect& bounds) {
-    return aura::test::CreateTestWindowWithBounds(bounds, NULL);
+    return CreateTestWindowInShellWithBounds(bounds);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(BaseLayoutManagerTest);
 };
 
 // Tests normal->maximize->normal.
 TEST_F(BaseLayoutManagerTest, Maximize) {
   gfx::Rect bounds(100, 100, 200, 200);
   scoped_ptr<aura::Window> window(CreateTestWindow(bounds));
@@ skipping 171 matching lines @@
             GetRestoreBoundsInParent(window.get()).ToString());
   EXPECT_TRUE(wm::IsWindowMaximized(window.get()));
 
   wm::RestoreWindow(window.get());
   EXPECT_EQ(bounds.ToString(), window->bounds().ToString());
 }
 
 }  // namespace
 
 }  // namespace ash