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

ash/wm/window_cycle_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/wm/window_cycle_controller.h"
 
 #include <algorithm>
 
 #include "ash/display/display_controller.h"
 #include "ash/display/display_manager.h"
@@ skipping 23 matching lines @@
 typedef test::AshTestBase WindowCycleControllerTest;
 
 TEST_F(WindowCycleControllerTest, HandleCycleWindowBaseCases) {
   WindowCycleController* controller =
       Shell::GetInstance()->window_cycle_controller();
 
   // Cycling doesn't crash if there are no windows.
   controller->HandleCycleWindow(WindowCycleController::FORWARD, false);
 
   // Create a single test window.
-  scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL));
+  scoped_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Cycling works for a single window, even though nothing changes.
   controller->HandleCycleWindow(WindowCycleController::FORWARD, false);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 // Verifies if there is only one window and it isn't active that cycling
 // activates it.
 TEST_F(WindowCycleControllerTest, SingleWindowNotActive) {
   WindowCycleController* controller =
       Shell::GetInstance()->window_cycle_controller();
 
   // Create a single test window.
-  scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL));
+  scoped_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Rotate focus, this should move focus to another window that isn't part of
   // the default container.
   Shell::GetInstance()->RotateFocus(Shell::FORWARD);
   EXPECT_FALSE(wm::IsActiveWindow(window0.get()));
 
   // Cycling should activate the window.
   controller->HandleCycleWindow(WindowCycleController::FORWARD, false);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 TEST_F(WindowCycleControllerTest, HandleCycleWindow) {
   WindowCycleController* controller =
       Shell::GetInstance()->window_cycle_controller();
 
   // Set up several windows to use to test cycling.  Create them in reverse
   // order so they are stacked 0 over 1 over 2.
-  scoped_ptr<Window> window2(CreateTestWindowWithId(2, NULL));
-  scoped_ptr<Window> window1(CreateTestWindowWithId(1, NULL));
-  scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL));
+  scoped_ptr<Window> window2(CreateTestWindowInShellWithId(2));
+  scoped_ptr<Window> window1(CreateTestWindowInShellWithId(1));
+  scoped_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   wm::ActivateWindow(window0.get());
 
   // Simulate pressing and releasing Alt-tab.
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
   controller->HandleCycleWindow(WindowCycleController::FORWARD, true);
 
   // Window lists should return the topmost window in front.
   ASSERT_TRUE(controller->windows());
   ASSERT_EQ(3u, controller->windows()->windows().size());
   ASSERT_EQ(window0.get(), controller->windows()->windows()[0]);
@@ skipping 84 matching lines @@
   controller->HandleCycleWindow(WindowCycleController::BACKWARD, false);
   EXPECT_TRUE(wm::IsActiveWindow(modal_window.get()));
   EXPECT_FALSE(wm::IsActiveWindow(window0.get()));
   EXPECT_FALSE(wm::IsActiveWindow(window1.get()));
   EXPECT_FALSE(wm::IsActiveWindow(window2.get()));
 }
 
 // Cycles between a maximized and normal window.
 TEST_F(WindowCycleControllerTest, MaximizedWindow) {
   // Create a couple of test windows.
-  scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL));
-  scoped_ptr<Window> window1(CreateTestWindowWithId(1, NULL));
+  scoped_ptr<Window> window0(CreateTestWindowInShellWithId(0));
+  scoped_ptr<Window> window1(CreateTestWindowInShellWithId(1));
 
   wm::MaximizeWindow(window1.get());
   wm::ActivateWindow(window1.get());
   EXPECT_TRUE(wm::IsActiveWindow(window1.get()));
 
   // Rotate focus, this should move focus to window0.
   WindowCycleController* controller =
       Shell::GetInstance()->window_cycle_controller();
   controller->HandleCycleWindow(WindowCycleController::FORWARD, false);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // One more time.
   controller->HandleCycleWindow(WindowCycleController::FORWARD, false);
   EXPECT_TRUE(wm::IsActiveWindow(window1.get()));
 }
 
 // Cycles to a minimized window.
 TEST_F(WindowCycleControllerTest, Minimized) {
   // Create a couple of test windows.
-  scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL));
-  scoped_ptr<Window> window1(CreateTestWindowWithId(1, NULL));
+  scoped_ptr<Window> window0(CreateTestWindowInShellWithId(0));
+  scoped_ptr<Window> window1(CreateTestWindowInShellWithId(1));
 
   wm::MinimizeWindow(window1.get());
   wm::ActivateWindow(window0.get());
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 
   // Rotate focus, this should move focus to window1 and unminimize it.
   WindowCycleController* controller =
       Shell::GetInstance()->window_cycle_controller();
   controller->HandleCycleWindow(WindowCycleController::FORWARD, false);
   EXPECT_FALSE(wm::IsWindowMinimized(window1.get()));
   EXPECT_TRUE(wm::IsActiveWindow(window1.get()));
 
   // One more time back to w0.
   controller->HandleCycleWindow(WindowCycleController::FORWARD, false);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 TEST_F(WindowCycleControllerTest, AlwaysOnTopWindow) {
   WindowCycleController* controller =
       Shell::GetInstance()->window_cycle_controller();
 
   // Set up several windows to use to test cycling.
-  scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL));
-  scoped_ptr<Window> window1(CreateTestWindowWithId(1, NULL));
+  scoped_ptr<Window> window0(CreateTestWindowInShellWithId(0));
+  scoped_ptr<Window> window1(CreateTestWindowInShellWithId(1));
 
   Window* top_container =
       Shell::GetContainer(
           Shell::GetPrimaryRootWindow(),
           internal::kShellWindowId_AlwaysOnTopContainer);
   scoped_ptr<Window> window2(CreateTestWindowWithId(2, top_container));
   wm::ActivateWindow(window0.get());
 
   // Simulate pressing and releasing Alt-tab.
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
@@ skipping 22 matching lines @@
 
   controller->HandleCycleWindow(WindowCycleController::FORWARD, true);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 TEST_F(WindowCycleControllerTest, AlwaysOnTopMultiWindow) {
   WindowCycleController* controller =
       Shell::GetInstance()->window_cycle_controller();
 
   // Set up several windows to use to test cycling.
-  scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL));
-  scoped_ptr<Window> window1(CreateTestWindowWithId(1, NULL));
+  scoped_ptr<Window> window0(CreateTestWindowInShellWithId(0));
+  scoped_ptr<Window> window1(CreateTestWindowInShellWithId(1));
 
   Window* top_container =
       Shell::GetContainer(
           Shell::GetPrimaryRootWindow(),
           internal::kShellWindowId_AlwaysOnTopContainer);
   scoped_ptr<Window> window2(CreateTestWindowWithId(2, top_container));
   scoped_ptr<Window> window3(CreateTestWindowWithId(3, top_container));
   wm::ActivateWindow(window0.get());
 
   // Simulate pressing and releasing Alt-tab.
@@ skipping 34 matching lines @@
   UpdateDisplay("0+0-1000x600,1001+0-600x400");
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();
   ASSERT_EQ(2U, root_windows.size());
 
   WindowCycleController* controller =
       Shell::GetInstance()->window_cycle_controller();
 
   Shell::GetInstance()->set_active_root_window(root_windows[0]);
 
   // Create two windows in the primary root.
-  scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL));
+  scoped_ptr<Window> window0(CreateTestWindowInShellWithId(0));
   EXPECT_EQ(root_windows[0], window0->GetRootWindow());
   Window* top_container0 =
       Shell::GetContainer(
           root_windows[0],
           internal::kShellWindowId_AlwaysOnTopContainer);
   scoped_ptr<Window> window1(CreateTestWindowWithId(1, top_container0));
   EXPECT_EQ(root_windows[0], window1->GetRootWindow());
 
   // And two on the secondary root.
   Shell::GetInstance()->set_active_root_window(root_windows[1]);
-  scoped_ptr<Window> window2(CreateTestWindowWithId(2, NULL));
+  scoped_ptr<Window> window2(CreateTestWindowInShellWithId(2));
   EXPECT_EQ(root_windows[1], window2->GetRootWindow());
 
   Window* top_container1 =
       Shell::GetContainer(
           root_windows[1],
           internal::kShellWindowId_AlwaysOnTopContainer);
   scoped_ptr<Window> window3(CreateTestWindowWithId(3, top_container1));
   EXPECT_EQ(root_windows[1], window3->GetRootWindow());
 
   // Move the active root window to the secondary.
@@ skipping 37 matching lines @@
 
   controller->HandleCycleWindow(WindowCycleController::FORWARD, true);
   EXPECT_TRUE(wm::IsActiveWindow(window2.get()));
 }
 
 TEST_F(WindowCycleControllerTest, MostRecentlyUsed) {
   WindowCycleController* controller =
       Shell::GetInstance()->window_cycle_controller();
 
   // Set up several windows to use to test cycling.
-  scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL));
-  scoped_ptr<Window> window1(CreateTestWindowWithId(1, NULL));
-  scoped_ptr<Window> window2(CreateTestWindowWithId(2, NULL));
+  scoped_ptr<Window> window0(CreateTestWindowInShellWithId(0));
+  scoped_ptr<Window> window1(CreateTestWindowInShellWithId(1));
+  scoped_ptr<Window> window2(CreateTestWindowInShellWithId(2));
 
   wm::ActivateWindow(window0.get());
 
   // Simulate pressing and releasing Alt-tab.
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
   controller->HandleCycleWindow(WindowCycleController::FORWARD, true);
 
   // Window lists should return the topmost window in front.
   ASSERT_TRUE(controller->windows());
   ASSERT_EQ(3u, controller->windows()->windows().size());
@@ skipping 17 matching lines @@
   controller->HandleCycleWindow(WindowCycleController::FORWARD, true);
   EXPECT_TRUE(wm::IsActiveWindow(window2.get()));
 
   controller->HandleCycleWindow(WindowCycleController::FORWARD, true);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 }  // namespace
 
 }  // namespace ash