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

ui/views/corewm/compound_event_filter_unittest.cc

Index: ui/views/corewm/compound_event_filter_unittest.cc
diff --git a/ui/views/corewm/compound_event_filter_unittest.cc b/ui/views/corewm/compound_event_filter_unittest.cc
index d073200828d4ee65a2ffc43d47e4e1cc0a1dd48f..677d2679f0521a28ee40b7f07e0e3c7d6fee4d00 100644
--- a/ui/views/corewm/compound_event_filter_unittest.cc
+++ b/ui/views/corewm/compound_event_filter_unittest.cc
@@ -80,7 +80,7 @@ TEST_F(CompoundEventFilterTest, TouchHidesCursor) {
   aura::Env::GetInstance()->AddPreTargetHandler(compound_filter.get());
   aura::test::TestWindowDelegate delegate;
   scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(&delegate, 1234,
-      gfx::Rect(5, 5, 100, 100), NULL));
+      gfx::Rect(5, 5, 100, 100), root_window()));
   window->Show();
   window->SetCapture();
 
@@ -132,8 +132,9 @@ TEST_F(CompoundEventFilterTest, FilterConsumedGesture) {
   compound_filter->AddHandler(gesure_handler.get());
   aura::Env::GetInstance()->AddPreTargetHandler(compound_filter.get());
   aura::test::TestWindowDelegate delegate;
+  DCHECK(root_window());
   scoped_ptr<aura::Window> window(CreateTestWindowWithDelegate(&delegate, 1234,
-      gfx::Rect(5, 5, 100, 100), NULL));
+      gfx::Rect(5, 5, 100, 100), root_window()));
   window->Show();
 
   EXPECT_TRUE(window->CanFocus());