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

ash/wm/panel_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/panel_layout_manager.h"
 
 #include "ash/ash_switches.h"
 #include "ash/launcher/launcher.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
@@ skipping 21 matching lines @@
   virtual void SetUp() OVERRIDE {
     ash::test::AshTestBase::SetUp();
     ASSERT_TRUE(ash::test::TestLauncherDelegate::instance());
 
     launcher_view_test_.reset(new test::LauncherViewTestAPI(
         Launcher::ForPrimaryDisplay()->GetLauncherViewForTest()));
     launcher_view_test_->SetAnimationDuration(1);
   }
 
   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);
     PanelLayoutManager* manager =
         static_cast<PanelLayoutManager*>(GetPanelContainer()->layout_manager());
     manager->Relayout();
     return window;
   }
 
   aura::Window* GetPanelContainer() {
@@ skipping 193 matching lines @@
   wm::ActivateWindow(w2.get());
   // Windows should be stacked 1 < 2 > 3
   w1.reset();
   EXPECT_NO_FATAL_FAILURE(IsPanelAboveLauncherIcon(w2.get()));
   EXPECT_NO_FATAL_FAILURE(IsPanelAboveLauncherIcon(w3.get()));
   EXPECT_TRUE(WindowIsAbove(w2.get(), w3.get()));
 }
 
 }  // namespace internal
 }  // namespace ash