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

ui/views/corewm/focus_controller_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.
 
 // Tests for:
 // Activation/Focus driven by:
 //  - user input events
 //  - api calls
 //  - window hide/destruction
 //  - focus changes
@@ skipping 83 matching lines @@
 
     // Hierarchy used by all tests:
     // root_window
     //  +-- w1
     //       +-- w11
     //  +-- w2
     //       +-- w21
     //            +-- w211
     aura::Window* w1 = aura::test::CreateTestWindowWithDelegate(
         aura::test::TestWindowDelegate::CreateSelfDestroyingDelegate(), 1,
-        gfx::Rect(0, 0, 50, 50), NULL);
+        gfx::Rect(0, 0, 50, 50), root_window());
     aura::test::CreateTestWindowWithDelegate(
         aura::test::TestWindowDelegate::CreateSelfDestroyingDelegate(), 11,
         gfx::Rect(5, 5, 10, 10), w1);
     aura::Window* w2 = aura::test::CreateTestWindowWithDelegate(
         aura::test::TestWindowDelegate::CreateSelfDestroyingDelegate(), 2,
-        gfx::Rect(75, 75, 50, 50), NULL);
+        gfx::Rect(75, 75, 50, 50), root_window());
     aura::Window* w21 = aura::test::CreateTestWindowWithDelegate(
         aura::test::TestWindowDelegate::CreateSelfDestroyingDelegate(), 21,
         gfx::Rect(5, 5, 10, 10), w2);
     aura::test::CreateTestWindowWithDelegate(
         aura::test::TestWindowDelegate::CreateSelfDestroyingDelegate(), 211,
         gfx::Rect(1, 1, 5, 5), w21);
   }
   virtual void TearDown() OVERRIDE {
     root_window()->RemovePreTargetHandler(focus_controller());
     aura::test::AuraTestBase::TearDown();
@@ skipping 311 matching lines @@
 // - Focuses a window, consumes events.
 //FOCUS_CONTROLLER_TESTS(ConsumesFocusEvents);
 
 // - Activates a window, consumes events.
 TEST_F(FocusControllerApiTest, ConsumeActivationEvents) {
 
 }
 
 }  // namespace corewm
 }  // namespace views