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

ash/root_window_controller_unittest.cc

Index: ash/root_window_controller_unittest.cc
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index 37bd96af9bade29519eeb5030f9816b42e80aa77..a1f3c3ec56ed7f2ec8a5f3ef9d31b84017c55c8e 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -147,8 +147,8 @@ TEST_F(RootWindowControllerTest, MoveWindows_Basic) {
   // 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);
   aura::client::GetFocusClient(root_windows[0])->FocusWindow(d2, NULL);
   tracker.Add(d2);