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

ash/wm/panel_layout_manager_unittest.cc

Index: ash/wm/panel_layout_manager_unittest.cc
diff --git a/ash/wm/panel_layout_manager_unittest.cc b/ash/wm/panel_layout_manager_unittest.cc
index e0a63b0532bf030cf895924440a6b00f4cb22cba..f871421d2658bf63dc26d55091bd3069d2c029b6 100644
--- a/ash/wm/panel_layout_manager_unittest.cc
+++ b/ash/wm/panel_layout_manager_unittest.cc
@@ -39,16 +39,15 @@ class PanelLayoutManagerTest : public ash::test::AshTestBase {
   }
 
   aura::Window* CreateNormalWindow() {
-    return aura::test::CreateTestWindowWithBounds(gfx::Rect(), NULL);
+    return CreateTestWindowInShellWithBounds(gfx::Rect());
   }
 
   aura::Window* CreatePanelWindow(const gfx::Rect& bounds) {
-    aura::Window* window = aura::test::CreateTestWindowWithDelegateAndType(
+    aura::Window* window = CreateTestWindowInShellWithDelegateAndType(
         NULL,
         aura::client::WINDOW_TYPE_PANEL,
         0,
-        bounds,
-        NULL /* parent should automatically become GetPanelContainer */);
+        bounds);
     ash::test::TestLauncherDelegate* launcher_delegate =
         ash::test::TestLauncherDelegate::instance();
     launcher_delegate->AddLauncherItem(window);