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

ash/accelerators/accelerator_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/accelerators/accelerator_table.h"
 #include "ash/caps_lock_delegate.h"
 #include "ash/display/display_manager.h"
 #include "ash/ime_control_delegate.h"
 #include "ash/screenshot_delegate.h"
@@ skipping 409 matching lines @@
   TestTarget target;
   GetController()->Register(accelerator_a, &target);
   EXPECT_TRUE(GetController()->IsRegistered(accelerator_a));
   EXPECT_FALSE(GetController()->IsRegistered(accelerator_shift_a));
   GetController()->UnregisterAll(&target);
   EXPECT_FALSE(GetController()->IsRegistered(accelerator_a));
 }
 
 TEST_F(AcceleratorControllerTest, WindowSnap) {
   scoped_ptr<aura::Window> window(
-      aura::test::CreateTestWindowWithBounds(gfx::Rect(5, 5, 20, 20), NULL));
+      CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
   const ui::Accelerator dummy;
 
   wm::ActivateWindow(window.get());
 
   {
     GetController()->PerformAction(WINDOW_SNAP_LEFT, dummy);
     gfx::Rect snap_left = window->bounds();
     GetController()->PerformAction(WINDOW_SNAP_LEFT, dummy);
     EXPECT_NE(window->bounds().ToString(), snap_left.ToString());
 
@@ skipping 73 matching lines @@
             GetController()->context()->previous_accelerator().type());
 
   GetController()->context()->UpdateContext(accelerator_b);
   EXPECT_FALSE(GetController()->context()->repeated());
   EXPECT_EQ(ui::ET_KEY_RELEASED,
             GetController()->context()->previous_accelerator().type());
 }
 
 TEST_F(AcceleratorControllerTest, SuppressToggleMaximized) {
   scoped_ptr<aura::Window> window(
-      aura::test::CreateTestWindowWithBounds(gfx::Rect(5, 5, 20, 20), NULL));
+      CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
   wm::ActivateWindow(window.get());
   const ui::Accelerator accelerator(ui::VKEY_A, ui::EF_NONE);
   const ui::Accelerator empty_accelerator;
 
   // Toggling not suppressed.
   GetController()->context()->UpdateContext(accelerator);
   GetController()->PerformAction(TOGGLE_MAXIMIZED, accelerator);
   EXPECT_TRUE(wm::IsWindowMaximized(window.get()));
 
   // The same accelerator - toggling suppressed.
@@ skipping 602 matching lines @@
   for (size_t k = 0 ; k < kActionsAllowedAtModalWindowLength; ++k)
     actionsAllowedAtModalWindow.insert(kActionsAllowedAtModalWindow[k]);
   for (std::set<AcceleratorAction>::const_iterator it =
            actionsAllowedAtModalWindow.begin();
        it != actionsAllowedAtModalWindow.end(); ++it) {
     EXPECT_FALSE(allActions.find(*it) == allActions.end())
         << " action from kActionsAllowedAtModalWindow"
         << " not found in kAcceleratorData. action: " << *it;
   }
   scoped_ptr<aura::Window> window(
-      aura::test::CreateTestWindowWithBounds(gfx::Rect(5, 5, 20, 20), NULL));
+      CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
   const ui::Accelerator dummy;
   wm::ActivateWindow(window.get());
   Shell::GetInstance()->SimulateModalWindowOpenForTesting(true);
   for (std::set<AcceleratorAction>::const_iterator it = allActions.begin();
        it != allActions.end(); ++it) {
     if (actionsAllowedAtModalWindow.find(*it) ==
         actionsAllowedAtModalWindow.end()) {
       EXPECT_TRUE(GetController()->PerformAction(*it, dummy))
           << " for action (disallowed at modal window): " << *it;
     }
@@ skipping 106 matching lines @@
     EXPECT_EQ(f9, delegate->last_accelerator());
     EXPECT_EQ(0, delegate->handle_volume_up_count());
     EXPECT_TRUE(ProcessWithContext(f10));
     EXPECT_EQ(1, delegate->handle_volume_up_count());
     EXPECT_EQ(f10, delegate->last_accelerator());
   }
 }
 #endif
 
 }  // namespace ash