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

ash/accelerators/nested_dispatcher_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.
 
 #include "ash/accelerators/accelerator_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "base/bind.h"
@@ skipping 89 matching lines @@
   ash::Shell::GetPrimaryRootWindow()->PostNativeEvent(ui::CreateNoopEvent());
 }
 
 }  // namespace
 
 typedef AshTestBase NestedDispatcherTest;
 
 // Aura window below lock screen in z order.
 TEST_F(NestedDispatcherTest, AssociatedWindowBelowLockScreen) {
   MockDispatcher inner_dispatcher;
-  scoped_ptr<aura::Window> associated_window(aura::test::CreateTestWindowWithId(
-      0, NULL));
+  scoped_ptr<aura::Window> associated_window(CreateTestWindowInShellWithId(0));
 
   Shell::GetInstance()->delegate()->LockScreen();
   DispatchKeyReleaseA();
   aura::RootWindow* root_window = ash::Shell::GetPrimaryRootWindow();
   aura::client::GetDispatcherClient(root_window)->RunWithDispatcher(
       &inner_dispatcher,
       associated_window.get(),
       true /* nestable_tasks_allowed */);
   EXPECT_EQ(0, inner_dispatcher.num_key_events_dispatched());
   Shell::GetInstance()->delegate()->UnlockScreen();
 }
 
 // Aura window above lock screen in z order.
 TEST_F(NestedDispatcherTest, AssociatedWindowAboveLockScreen) {
   MockDispatcher inner_dispatcher;
 
   scoped_ptr<aura::Window>mock_lock_container(
-      aura::test::CreateTestWindowWithId(0, NULL));
+      CreateTestWindowInShellWithId(0));
   aura::test::CreateTestWindowWithId(0, mock_lock_container.get());
-  scoped_ptr<aura::Window>associated_window(aura::test::CreateTestWindowWithId(
-      0, NULL));
+  scoped_ptr<aura::Window> associated_window(CreateTestWindowInShellWithId(0));
   EXPECT_TRUE(aura::test::WindowIsAbove(associated_window.get(),
       mock_lock_container.get()));
 
   DispatchKeyReleaseA();
   aura::RootWindow* root_window = ash::Shell::GetPrimaryRootWindow();
   aura::client::GetDispatcherClient(root_window)->RunWithDispatcher(
       &inner_dispatcher,
       associated_window.get(),
       true /* nestable_tasks_allowed */);
   EXPECT_EQ(1, inner_dispatcher.num_key_events_dispatched());
@@ skipping 14 matching lines @@
   aura::client::GetDispatcherClient(root_window)->RunWithDispatcher(
       &inner_dispatcher,
       root_window,
       true /* nestable_tasks_allowed */);
   EXPECT_EQ(0, inner_dispatcher.num_key_events_dispatched());
   EXPECT_EQ(1, target.accelerator_pressed_count());
 }
 
 } //  namespace test
 } //  namespace ash