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

ash/focus_cycler_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/focus_cycler.h"
 
 #include "ash/launcher/launcher.h"
 #include "ash/root_window_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
 #include "ash/system/status_area_widget_delegate.h"
 #include "ash/system/tray/system_tray.h"
 #include "ash/wm/window_util.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/shell_factory.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/views/controls/button/menu_button.h"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 namespace test {
 
-using aura::test::CreateTestWindowWithId;
 using aura::Window;
 using internal::FocusCycler;
 
 namespace {
 
 internal::StatusAreaWidgetDelegate* GetStatusAreaWidgetDelegate(
     views::Widget* widget) {
   return static_cast<internal::StatusAreaWidgetDelegate*>(
       widget->GetContentsView());
 }
@@ skipping 62 matching lines @@
 
  private:
   scoped_ptr<FocusCycler> focus_cycler_;
   scoped_ptr<SystemTray> tray_;
 
   DISALLOW_COPY_AND_ASSIGN(FocusCyclerTest);
 };
 
 TEST_F(FocusCyclerTest, CycleFocusBrowserOnly) {
   // 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()));
 
   // Cycle the window
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 TEST_F(FocusCyclerTest, CycleFocusForward) {
   ASSERT_TRUE(CreateTray());
 
   InstallFocusCycleOnLauncher();
 
   // 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()));
 
   // Cycle focus to the status area
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(tray()->GetWidget()->IsActive());
 
   // Cycle focus to the launcher
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(launcher_widget()->IsActive());
 
   // Cycle focus to the browser
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 TEST_F(FocusCyclerTest, CycleFocusBackward) {
   ASSERT_TRUE(CreateTray());
 
   InstallFocusCycleOnLauncher();
 
   // 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()));
 
   // Cycle focus to the launcher
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(launcher_widget()->IsActive());
 
   // Cycle focus to the status area
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(tray()->GetWidget()->IsActive());
 
   // Cycle focus to the browser
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 TEST_F(FocusCyclerTest, CycleFocusForwardBackward) {
   ASSERT_TRUE(CreateTray());
 
   InstallFocusCycleOnLauncher();
 
   // 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()));
 
   // Cycle focus to the launcher
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(launcher_widget()->IsActive());
 
   // Cycle focus to the status area
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(tray()->GetWidget()->IsActive());
@@ skipping 43 matching lines @@
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(tray()->GetWidget()->IsActive());
 }
 
 TEST_F(FocusCyclerTest, Launcher_CycleFocusForward) {
   ASSERT_TRUE(CreateTray());
   InstallFocusCycleOnLauncher();
   launcher_widget()->Hide();
 
   // 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()));
 
   // Cycle focus to the status area
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(tray()->GetWidget()->IsActive());
 
   // Cycle focus to the browser
   focus_cycler()->RotateFocus(FocusCycler::FORWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 TEST_F(FocusCyclerTest, Launcher_CycleFocusBackwardInvisible) {
   ASSERT_TRUE(CreateTray());
   InstallFocusCycleOnLauncher();
   launcher_widget()->Hide();
 
   // 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()));
 
   // Cycle focus to the status area
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(tray()->GetWidget()->IsActive());
 
   // Cycle focus to the browser
   focus_cycler()->RotateFocus(FocusCycler::BACKWARD);
   EXPECT_TRUE(wm::IsActiveWindow(window0.get()));
 }
 
 }  // namespace test
 }  // namespace ash