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

ash/shell_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/ash_switches.h"
 #include "ash/desktop_background/desktop_background_widget_controller.h"
 #include "ash/launcher/launcher.h"
 #include "ash/shell.h"
 #include "ash/shell_delegate.h"
 #include "ash/shell_window_ids.h"
@@ skipping 67 matching lines @@
 
 void TestCreateWindow(views::Widget::InitParams::Type type,
                       bool always_on_top,
                       aura::Window* expected_container) {
   views::Widget::InitParams widget_params(type);
   widget_params.keep_on_top = always_on_top;
 
   views::Widget* widget = CreateTestWindow(widget_params);
   widget->Show();
 
-  EXPECT_EQ(expected_container, widget->GetNativeWindow()->parent()) <<
+  EXPECT_TRUE(expected_container->Contains(
+                  widget->GetNativeWindow()->parent())) <<
       "TestCreateWindow: type=" << type << ", always_on_top=" << always_on_top;
 
   widget->Close();
 }
 
 class ModalWindow : public views::WidgetDelegateView {
  public:
   ModalWindow() {}
   virtual ~ModalWindow() {}
 
@@ skipping 39 matching lines @@
 
 TEST_F(ShellTest, ChangeAlwaysOnTop) {
   views::Widget::InitParams widget_params(
       views::Widget::InitParams::TYPE_WINDOW);
 
   // Creates a normal window
   views::Widget* widget = CreateTestWindow(widget_params);
   widget->Show();
 
   // It should be in default container.
-  EXPECT_EQ(GetDefaultContainer(), widget->GetNativeWindow()->parent());
+  EXPECT_TRUE(GetDefaultContainer()->Contains(
+                  widget->GetNativeWindow()->parent()));
 
   // Flip always-on-top flag.
   widget->SetAlwaysOnTop(true);
   // And it should in always on top container now.
   EXPECT_EQ(GetAlwaysOnTopContainer(), widget->GetNativeWindow()->parent());
 
   // Flip always-on-top flag.
   widget->SetAlwaysOnTop(false);
   // It should go back to default container.
-  EXPECT_EQ(GetDefaultContainer(), widget->GetNativeWindow()->parent());
+  EXPECT_TRUE(GetDefaultContainer()->Contains(
+                  widget->GetNativeWindow()->parent()));
 
   // Set the same always-on-top flag again.
   widget->SetAlwaysOnTop(false);
   // Should have no effect and we are still in the default container.
-  EXPECT_EQ(GetDefaultContainer(), widget->GetNativeWindow()->parent());
+  EXPECT_TRUE(GetDefaultContainer()->Contains(
+                  widget->GetNativeWindow()->parent()));
 
   widget->Close();
 }
 
 TEST_F(ShellTest, CreateModalWindow) {
   views::Widget::InitParams widget_params(
       views::Widget::InitParams::TYPE_WINDOW);
 
   // Create a normal window.
   views::Widget* widget = CreateTestWindow(widget_params);
   widget->Show();
 
   // It should be in default container.
-  EXPECT_EQ(GetDefaultContainer(), widget->GetNativeWindow()->parent());
+  EXPECT_TRUE(GetDefaultContainer()->Contains(
+                  widget->GetNativeWindow()->parent()));
 
   // Create a modal window.
   views::Widget* modal_widget = views::Widget::CreateWindowWithParent(
       new ModalWindow(), widget->GetNativeView());
   modal_widget->Show();
 
   // It should be in modal container.
   aura::Window* modal_container = Shell::GetContainer(
       Shell::GetPrimaryRootWindow(),
       internal::kShellWindowId_SystemModalContainer);
   EXPECT_EQ(modal_container, modal_widget->GetNativeWindow()->parent());
 
   modal_widget->Close();
   widget->Close();
 }
 
 TEST_F(ShellTest, CreateLockScreenModalWindow) {
   views::Widget::InitParams widget_params(
       views::Widget::InitParams::TYPE_WINDOW);
 
   // Create a normal window.
   views::Widget* widget = CreateTestWindow(widget_params);
   widget->Show();
 
   // It should be in default container.
-  EXPECT_EQ(GetDefaultContainer(), widget->GetNativeWindow()->parent());
+  EXPECT_TRUE(GetDefaultContainer()->Contains(
+                  widget->GetNativeWindow()->parent()));
 
   // Create a LockScreen window.
   views::Widget* lock_widget = CreateTestWindow(widget_params);
   ash::Shell::GetContainer(
       Shell::GetPrimaryRootWindow(),
       ash::internal::kShellWindowId_LockScreenContainer)->
       AddChild(lock_widget->GetNativeView());
   lock_widget->Show();
 
   // It should be in LockScreen container.
@@ skipping 43 matching lines @@
 #define MAYBE_ManagedWindowModeBasics FAILS_ManagedWindowModeBasics
 #else
 #define MAYBE_ManagedWindowModeBasics ManagedWindowModeBasics
 #endif
 TEST_F(ShellTest, MAYBE_ManagedWindowModeBasics) {
   Shell* shell = Shell::GetInstance();
   Shell::TestApi test_api(shell);
 
   // We start with the usual window containers.
   ExpectAllContainers();
-  // We have a default container event filter (for window drags).
-  EXPECT_TRUE(GetDefaultContainer()->event_filter());
   // Launcher is visible.
   views::Widget* launcher_widget = shell->launcher()->widget();
   EXPECT_TRUE(launcher_widget->IsVisible());
   // Launcher is at bottom-left of screen.
   EXPECT_EQ(0, launcher_widget->GetWindowBoundsInScreen().x());
   EXPECT_EQ(Shell::GetPrimaryRootWindow()->GetHostSize().height(),
             launcher_widget->GetWindowBoundsInScreen().bottom());
   // We have a desktop background but not a bare layer.
   // TODO (antrim): enable once we find out why it fails component build.
   //  internal::DesktopBackgroundWidgetController* background =
   //      Shell::GetPrimaryRootWindow()->
   //          GetProperty(internal::kWindowDesktopComponent);
   //  EXPECT_TRUE(background);
   //  EXPECT_TRUE(background->widget());
   //  EXPECT_FALSE(background->layer());
 
   // Create a normal window.  It is not maximized.
   views::Widget::InitParams widget_params(
       views::Widget::InitParams::TYPE_WINDOW);
   widget_params.bounds.SetRect(11, 22, 300, 400);
   views::Widget* widget = CreateTestWindow(widget_params);
   widget->Show();
   EXPECT_FALSE(widget->IsMaximized());
 
+  // We have a default container event filter (for window drags).
+  EXPECT_TRUE(widget->GetNativeWindow()->parent()->event_filter());
+
   // Clean up.
   widget->Close();
 }
 
 TEST_F(ShellTest, FullscreenWindowHidesShelf) {
   ExpectAllContainers();
 
   // Create a normal window.  It is not maximized.
   views::Widget::InitParams widget_params(
       views::Widget::InitParams::TYPE_WINDOW);
@@ skipping 38 matching lines @@
  private:
   DISALLOW_COPY_AND_ASSIGN(ShellTest2);
 };
 
 TEST_F(ShellTest2, DontCrashWhenWindowDeleted) {
   window_.reset(new aura::Window(NULL));
   window_->Init(ui::LAYER_NOT_DRAWN);
 }
 
 }  // namespace ash