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

ash/wm/system_modal_container_layout_manager_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/system_modal_container_layout_manager.h"
 
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
@@ skipping 11 matching lines @@
 namespace test {
 
 namespace {
 
 aura::Window* GetModalContainer() {
   return Shell::GetContainer(
       Shell::GetPrimaryRootWindow(),
       ash::internal::kShellWindowId_SystemModalContainer);
 }
 
-aura::Window* GetDefaultContainer() {
-  return Shell::GetContainer(
-      Shell::GetPrimaryRootWindow(),
-      ash::internal::kShellWindowId_DefaultContainer);
-}
-
 class TestWindow : public views::WidgetDelegateView {
  public:
   explicit TestWindow(bool modal) : modal_(modal) {}
   virtual ~TestWindow() {}
 
   static aura::Window* OpenTestWindow(aura::Window* parent, bool modal) {
     views::Widget* widget =
         views::Widget::CreateWindowWithParent(new TestWindow(modal), parent);
     widget->Show();
     return widget->GetNativeView();
@@ skipping 66 matching lines @@
 
 typedef AshTestBase SystemModalContainerLayoutManagerTest;
 
 TEST_F(SystemModalContainerLayoutManagerTest, NonModalTransient) {
   scoped_ptr<aura::Window> parent(TestWindow::OpenTestWindow(NULL, false));
   aura::Window* transient = TestWindow::OpenTestWindow(parent.get(), false);
   TransientWindowObserver destruction_observer;
   transient->AddObserver(&destruction_observer);
 
   EXPECT_EQ(parent.get(), transient->transient_parent());
-  EXPECT_EQ(GetDefaultContainer(), transient->parent());
+  EXPECT_EQ(parent->parent(), transient->parent());
 
   // The transient should be destroyed with its parent.
   parent.reset();
   EXPECT_TRUE(destruction_observer.destroyed());
 }
 
 TEST_F(SystemModalContainerLayoutManagerTest, ModalTransient) {
   scoped_ptr<aura::Window> parent(TestWindow::OpenTestWindow(NULL, false));
   // parent should be active.
   EXPECT_TRUE(wm::IsActiveWindow(parent.get()));
@@ skipping 207 matching lines @@
   // We set now the bounds of the root window to something new which will
   // Then trigger the repos operation.
   GetModalContainer()->SetBounds(gfx::Rect(0, 0, 800, 600));
 
   gfx::Rect bounds = main->bounds();
   EXPECT_EQ(bounds, gfx::Rect(700, 500, 100, 100));
 }
 
 }  // namespace test
 }  // namespace ash