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

ash/wm/frame_painter_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/frame_painter.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "base/memory/scoped_ptr.h"
 #include "grit/ui_resources.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/root_window.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/widget/widget.h"
 
 using views::Widget;
 using views::ImageButton;
 
 namespace {
 
-aura::Window* GetDefaultContainer() {
-  return ash::Shell::GetContainer(
-      ash::Shell::GetPrimaryRootWindow(),
-      ash::internal::kShellWindowId_DefaultContainer);
-}
-
 // Creates a test widget that owns its native widget.
 Widget* CreateTestWidget() {
   Widget* widget = new Widget;
   Widget::InitParams params;
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  params.parent = GetDefaultContainer();
-  params.child = true;
   widget->Init(params);
   return widget;
 }
 
 Widget* CreateAlwaysOnTopWidget() {
   Widget* widget = new Widget;
   Widget::InitParams params;
   params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  params.parent = GetDefaultContainer();
-  params.child = true;
   params.keep_on_top = true;
   widget->Init(params);
   return widget;
 }
 
 }  // namespace
 
 namespace ash {
 
 typedef ash::test::AshTestBase FramePainterTest;
@@ skipping 110 matching lines @@
 
   // Custom overlay image is drawn completely opaque.
   gfx::ImageSkia custom_overlay;
   EXPECT_EQ(255,
             p1.GetHeaderOpacity(FramePainter::ACTIVE,
                                 IDR_AURA_WINDOW_HEADER_BASE_ACTIVE,
                                 &custom_overlay));
 }
 
 }  // namespace ash