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

ash/accelerators/accelerator_filter_unittest.cc

Index: ash/accelerators/accelerator_filter_unittest.cc
diff --git a/ash/accelerators/accelerator_filter_unittest.cc b/ash/accelerators/accelerator_filter_unittest.cc
index 210b849d2e9be546436ece062094bca0f6c48d54..efeb90bf8d52ee7094c4c3a2d73f03ce5c773061 100644
--- a/ash/accelerators/accelerator_filter_unittest.cc
+++ b/ash/accelerators/accelerator_filter_unittest.cc
@@ -80,11 +80,10 @@ TEST_F(AcceleratorFilterTest, TestFilterWithoutFocus) {
 // Tests if AcceleratorFilter works as expected with a focused window.
 TEST_F(AcceleratorFilterTest, TestFilterWithFocus) {
   aura::test::TestWindowDelegate test_delegate;
-  scoped_ptr<aura::Window> window(aura::test::CreateTestWindowWithDelegate(
+  scoped_ptr<aura::Window> window(CreateTestWindowInShellWithDelegate(
       &test_delegate,
       -1,
-      gfx::Rect(),
-      NULL));
+      gfx::Rect()));
   wm::ActivateWindow(window.get());
 
   DummyScreenshotDelegate* delegate = new DummyScreenshotDelegate;