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

ash/root_window_controller_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/root_window_controller.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
@@ skipping 129 matching lines @@
   EXPECT_EQ("600,0 500x500",
             fullscreen->GetWindowBoundsInScreen().ToString());
   EXPECT_EQ("0,0 500x500",
             fullscreen->GetNativeView()->GetBoundsInRootWindow().ToString());
 #endif
 
   // Make sure a window that will delete itself when losing focus
   // will not crash.
   aura::WindowTracker tracker;
   DeleteOnBlurDelegate delete_on_blur_delegate;
-  aura::Window* d2 = aura::test::CreateTestWindowWithDelegate(
-      &delete_on_blur_delegate, 0, gfx::Rect(50, 50, 100, 100), NULL);
+  aura::Window* d2 = CreateTestWindowInShellWithDelegate(
+      &delete_on_blur_delegate, 0, gfx::Rect(50, 50, 100, 100));
   delete_on_blur_delegate.set_window(d2);
   root_windows[0]->GetFocusManager()->SetFocusedWindow(
       d2, NULL);
   tracker.Add(d2);
 
   UpdateDisplay("600x600");
 
   // d2 must have been deleted.
   EXPECT_FALSE(tracker.Contains(d2));
 
@@ skipping 147 matching lines @@
   views::Widget* session_modal_widget =
         CreateModalWidget(gfx::Rect(300, 10, 100, 100));
   EXPECT_EQ(Shell::GetContainer(controller->root_window(),
       internal::kShellWindowId_SystemModalContainer)->layout_manager(),
           controller->GetSystemModalLayoutManager(
               session_modal_widget->GetNativeView()));
 }
 
 }  // namespace test
 }  // namespace ash