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

chrome/browser/chromeos/extensions/wallpaper_private_api_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/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_shell_delegate.h"
 #include "ash/wm/window_util.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/extensions/wallpaper_private_api.h"
@@ skipping 34 matching lines @@
   bool RunImpl() OVERRIDE {
     return WallpaperRestoreMinimizedWindowsFunction::RunImpl();
   }
  protected:
   virtual ~TestRestoreFunction() {}
 };
 
 }  // 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());
 
   // Window 3 starts minimized, window 1 starts maximized.
   EXPECT_FALSE(ash::wm::IsWindowMinimized(window0.get()));
   EXPECT_FALSE(ash::wm::IsWindowMinimized(window1.get()));
   EXPECT_FALSE(ash::wm::IsWindowMinimized(window2.get()));
   EXPECT_TRUE(ash::wm::IsWindowMinimized(window3.get()));
 
@@ skipping 17 matching lines @@
       new TestRestoreFunction());
   EXPECT_TRUE(restore_function->RunImpl());
 
   // Windows 1 and 2 should no longer be minimized. Window 1 should again
   // be maximized. Window 3 should still be minimized.
   EXPECT_FALSE(ash::wm::IsWindowMinimized(window1.get()));
   EXPECT_TRUE(ash::wm::IsWindowMaximized(window1.get()));
   EXPECT_FALSE(ash::wm::IsWindowMinimized(window2.get()));
   EXPECT_TRUE(ash::wm::IsWindowMinimized(window3.get()));
 }