Prepare a bunch of ash tests for workspace2. With Workspace2 you can't

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/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/system/status_area_widget.h"
@@ skipping 30 matching lines @@
 }
 
 }  // namespace
 
 typedef AshTestBase FocusCyclerTest;
 
 TEST_F(FocusCyclerTest, CycleFocusBrowserOnly) {
   scoped_ptr<FocusCycler> focus_cycler(new FocusCycler());
 
   // Create a single test window.
-  Window* default_container = Shell::GetContainer(
-      Shell::GetPrimaryRootWindow(),
-      internal::kShellWindowId_DefaultContainer);
-  scoped_ptr<Window> window0(CreateTestWindowWithId(0, default_container));
+  scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL));
   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) {
   scoped_ptr<FocusCycler> focus_cycler(new FocusCycler());
 
   // Add the Status area
   scoped_ptr<SystemTray> tray(CreateSystemTray());
   ASSERT_TRUE(tray->GetWidget());
   focus_cycler->AddWidget(tray->GetWidget());
   GetStatusAreaWidgetDelegate(tray->GetWidget())->SetFocusCyclerForTesting(
       focus_cycler.get());
 
   // Add the launcher
   Launcher* launcher = Shell::GetInstance()->launcher();
   ASSERT_TRUE(launcher);
   views::Widget* launcher_widget = launcher->widget();
   ASSERT_TRUE(launcher_widget);
   launcher->SetFocusCycler(focus_cycler.get());
 
   // Create a single test window.
-  Window* default_container = Shell::GetContainer(
-      Shell::GetPrimaryRootWindow(),
-      internal::kShellWindowId_DefaultContainer);
-  scoped_ptr<Window> window0(CreateTestWindowWithId(0, default_container));
+  scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL));
   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());
@@ skipping 14 matching lines @@
       focus_cycler.get());
 
   // Add the launcher
   Launcher* launcher = Shell::GetInstance()->launcher();
   ASSERT_TRUE(launcher);
   views::Widget* launcher_widget = launcher->widget();
   ASSERT_TRUE(launcher_widget);
   launcher->SetFocusCycler(focus_cycler.get());
 
   // Create a single test window.
-  Window* default_container = Shell::GetContainer(
-      Shell::GetPrimaryRootWindow(),
-      internal::kShellWindowId_DefaultContainer);
-  scoped_ptr<Window> window0(CreateTestWindowWithId(0, default_container));
+  scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL));
   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 14 matching lines @@
       focus_cycler.get());
 
   // Add the launcher
   Launcher* launcher = Shell::GetInstance()->launcher();
   ASSERT_TRUE(launcher);
   views::Widget* launcher_widget = launcher->widget();
   ASSERT_TRUE(launcher_widget);
   launcher->SetFocusCycler(focus_cycler.get());
 
   // Create a single test window.
-  Window* default_container = Shell::GetContainer(
-      Shell::GetPrimaryRootWindow(),
-      internal::kShellWindowId_DefaultContainer);
-  scoped_ptr<Window> window0(CreateTestWindowWithId(0, default_container));
+  scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL));
   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 96 matching lines @@
       focus_cycler.get());
 
   // Add the launcher
   Launcher* launcher = Shell::GetInstance()->launcher();
   ASSERT_TRUE(launcher);
   views::Widget* launcher_widget = launcher->widget();
   ASSERT_TRUE(launcher_widget);
   launcher->SetFocusCycler(focus_cycler.get());
 
   // Create a single test window.
-  Window* default_container = Shell::GetContainer(
-      Shell::GetPrimaryRootWindow(),
-      internal::kShellWindowId_DefaultContainer);
-  scoped_ptr<Window> window0(CreateTestWindowWithId(0, default_container));
+  scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL));
   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()));
@@ skipping 10 matching lines @@
       focus_cycler.get());
 
   // Add the launcher
   Launcher* launcher = Shell::GetInstance()->launcher();
   ASSERT_TRUE(launcher);
   views::Widget* launcher_widget = launcher->widget();
   ASSERT_TRUE(launcher_widget);
   launcher->SetFocusCycler(focus_cycler.get());
 
   // Create a single test window.
-  Window* default_container = Shell::GetInstance()->GetContainer(
-      Shell::GetPrimaryRootWindow(),
-      internal::kShellWindowId_DefaultContainer);
-  scoped_ptr<Window> window0(CreateTestWindowWithId(0, default_container));
+  scoped_ptr<Window> window0(CreateTestWindowWithId(0, NULL));
   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