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

chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc

Index: chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
index 61fe4e1f19e3dc5273a3cee47da487bc38589742..fd4af77f2847ab7586b235f6553af5b40848821f 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
@@ -52,10 +52,10 @@ class TestRestoreFunction : public WallpaperRestoreMinimizedWindowsFunction {
 }  // namespace
 
 TEST_F(WallpaperPrivateApiUnittest, HideAndRestoreWindows) {
-  scoped_ptr<aura::Window> window3(aura::test::CreateTestWindowWithId(3, NULL));
-  scoped_ptr<aura::Window> window2(aura::test::CreateTestWindowWithId(2, NULL));
-  scoped_ptr<aura::Window> window1(aura::test::CreateTestWindowWithId(1, NULL));
-  scoped_ptr<aura::Window> window0(aura::test::CreateTestWindowWithId(0, NULL));
+  scoped_ptr<aura::Window> window3(CreateTestWindowInShellWithId(3));
+  scoped_ptr<aura::Window> window2(CreateTestWindowInShellWithId(2));
+  scoped_ptr<aura::Window> window1(CreateTestWindowInShellWithId(1));
+  scoped_ptr<aura::Window> window0(CreateTestWindowInShellWithId(0));
 
   ash::wm::MinimizeWindow(window3.get());
   ash::wm::MaximizeWindow(window1.get());