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

ash/wm/system_modal_container_layout_manager_unittest.cc

Index: ash/wm/system_modal_container_layout_manager_unittest.cc
diff --git a/ash/wm/system_modal_container_layout_manager_unittest.cc b/ash/wm/system_modal_container_layout_manager_unittest.cc
index 878485354bcef1e451177a355e348a2c39ae90b1..33397e6f0cd2448d72e469c15568b3abe3f14fe6 100644
--- a/ash/wm/system_modal_container_layout_manager_unittest.cc
+++ b/ash/wm/system_modal_container_layout_manager_unittest.cc
@@ -29,12 +29,6 @@ aura::Window* GetModalContainer() {
       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) {}
@@ -121,7 +115,7 @@ TEST_F(SystemModalContainerLayoutManagerTest, NonModalTransient) {
   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();