chromeos: makes more tests run in both mash and ash

ash/root_window_controller_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/root_window_controller.h"
 
 #include <memory>
 
 #include "ash/common/session/session_controller.h"
 #include "ash/common/session/session_state_delegate.h"
@@ skipping 117 matching lines @@
     return widget;
   }
 
   aura::Window* GetModalContainer(aura::Window* root_window) {
     return Shell::GetContainer(root_window,
                                kShellWindowId_SystemModalContainer);
   }
 };
 
 TEST_F(RootWindowControllerTest, MoveWindows_Basic) {
+  // TODO: triggers shutdown crash in mash. http://crbug.com/695632.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   // Windows origin should be doubled when moved to the 1st display.
   UpdateDisplay("600x600,300x300");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
 
   views::Widget* normal = CreateTestWidget(gfx::Rect(650, 10, 100, 100));
   EXPECT_EQ(root_windows[1], normal->GetNativeView()->GetRootWindow());
   EXPECT_EQ("650,10 100x100", normal->GetWindowBoundsInScreen().ToString());
   EXPECT_EQ("50,10 100x100",
             normal->GetNativeView()->GetBoundsInRootWindow().ToString());
 
   views::Widget* maximized = CreateTestWidget(gfx::Rect(700, 10, 100, 100));
   maximized->Maximize();
   EXPECT_EQ(root_windows[1], maximized->GetNativeView()->GetRootWindow());
   EXPECT_EQ(gfx::Rect(600, 0, 300, 252).ToString(),
             maximized->GetWindowBoundsInScreen().ToString());
   EXPECT_EQ(gfx::Rect(0, 0, 300, 252).ToString(),
             maximized->GetNativeView()->GetBoundsInRootWindow().ToString());
 
   views::Widget* minimized = CreateTestWidget(gfx::Rect(550, 10, 200, 200));
   minimized->Minimize();
   EXPECT_EQ(root_windows[1], minimized->GetNativeView()->GetRootWindow());
   EXPECT_EQ("550,10 200x200", minimized->GetWindowBoundsInScreen().ToString());
 
   views::Widget* fullscreen = CreateTestWidget(gfx::Rect(850, 10, 200, 200));
-  display::Display secondary_display =
-      Shell::GetInstance()->display_manager()->GetSecondaryDisplay();
+  display::Display secondary_display = GetSecondaryDisplay();
   gfx::Rect orig_bounds = fullscreen->GetWindowBoundsInScreen();
   EXPECT_TRUE(secondary_display.work_area().Intersects(orig_bounds));
   EXPECT_FALSE(secondary_display.work_area().Contains(orig_bounds));
 
   fullscreen->SetFullscreen(true);
   EXPECT_EQ(root_windows[1], fullscreen->GetNativeView()->GetRootWindow());
 
   EXPECT_EQ("600,0 300x300", fullscreen->GetWindowBoundsInScreen().ToString());
   EXPECT_EQ("0,0 300x300",
             fullscreen->GetNativeView()->GetBoundsInRootWindow().ToString());
@@ skipping 110 matching lines @@
 
   UpdateDisplay("500x500");
   EXPECT_EQ(root_windows[0], modal->GetNativeView()->GetRootWindow());
   EXPECT_TRUE(wm::IsActiveWindow(modal->GetNativeView()));
   generator_1st.ClickLeftButton();
   EXPECT_TRUE(wm::IsActiveWindow(modal->GetNativeView()));
 }
 
 // Make sure lock related windows moves.
 TEST_F(RootWindowControllerTest, MoveWindows_LockWindowsInUnified) {
+  // TODO: requires unified desktop mode. http://crbug.com/581462.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   display_manager()->SetUnifiedDesktopEnabled(true);
 
   UpdateDisplay("500x500");
   const int kLockScreenWindowId = 1000;
   const int kLockWallpaperWindowId = 1001;
 
   RootWindowController* controller = Shell::GetPrimaryRootWindowController();
 
   aura::Window* lock_container =
       controller->GetContainer(kShellWindowId_LockScreenContainer);
@@ skipping 438 matching lines @@
   ASSERT_TRUE(Shell::GetContainer(primary_root_window,
                                   kShellWindowId_VirtualKeyboardContainer));
   ASSERT_FALSE(Shell::GetContainer(secondary_root_window,
                                    kShellWindowId_VirtualKeyboardContainer));
 }
 
 // Test for http://crbug.com/303429. Virtual keyboard container should show on
 // a display which has touch capability.
 TEST_F(VirtualKeyboardRootWindowControllerTest,
        VirtualKeyboardOnTouchableDisplayOnly) {
+  // TODO: investigate failure in mash. http://crbug.com/695640.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   UpdateDisplay("500x500,500x500");
   display::Display secondary_display =
       Shell::GetInstance()->display_manager()->GetSecondaryDisplay();
   display::test::DisplayManagerTestApi(Shell::GetInstance()->display_manager())
       .SetTouchSupport(secondary_display.id(),
                        display::Display::TouchSupport::TOUCH_SUPPORT_AVAILABLE);
 
   // The primary display doesn't have touch capability and the secondary display
   // does.
   ASSERT_NE(display::Display::TouchSupport::TOUCH_SUPPORT_AVAILABLE,
@@ skipping 30 matching lines @@
   keyboard::KeyboardController::GetInstance()->ShowKeyboard(false);
   EXPECT_FALSE(Shell::GetContainer(primary_root_window,
                                    kShellWindowId_VirtualKeyboardContainer));
   EXPECT_TRUE(Shell::GetContainer(secondary_root_window,
                                   kShellWindowId_VirtualKeyboardContainer));
 }
 
 // Test for http://crbug.com/303429. If both of displays have touch capability,
 // virtual keyboard follows the input focus.
 TEST_F(VirtualKeyboardRootWindowControllerTest, FollowInputFocus) {
+  // TODO: investigate failure in mash. http://crbug.com/695640.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   UpdateDisplay("500x500,500x500");
   const int64_t primary_display_id =
       display::Screen::GetScreen()->GetPrimaryDisplay().id();
   display::test::DisplayManagerTestApi(Shell::GetInstance()->display_manager())
       .SetTouchSupport(primary_display_id,
                        display::Display::TouchSupport::TOUCH_SUPPORT_AVAILABLE);
   const int64_t secondary_display_id =
       Shell::GetInstance()->display_manager()->GetSecondaryDisplay().id();
   display::test::DisplayManagerTestApi(Shell::GetInstance()->display_manager())
       .SetTouchSupport(secondary_display_id,
@@ skipping 48 matching lines @@
   EXPECT_TRUE(Shell::GetContainer(primary_root_window,
                                   kShellWindowId_VirtualKeyboardContainer));
   EXPECT_FALSE(Shell::GetContainer(secondary_root_window,
                                    kShellWindowId_VirtualKeyboardContainer));
 }
 
 // Test for http://crbug.com/303429. Even if both of display don't have touch
 // capability, the virtual keyboard shows up on the specified display.
 TEST_F(VirtualKeyboardRootWindowControllerTest,
        VirtualKeyboardShowOnSpecifiedDisplay) {
+  // TODO: fails in mash. http://crbug.com/695640.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   UpdateDisplay("500x500,500x500");
-  display::Display secondary_display =
-      Shell::GetInstance()->display_manager()->GetSecondaryDisplay();
+  display::Display secondary_display = GetSecondaryDisplay();
 
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   aura::Window* primary_root_window = Shell::GetPrimaryRootWindow();
   aura::Window* secondary_root_window = root_windows[0] == primary_root_window
                                             ? root_windows[1]
                                             : root_windows[0];
 
   ASSERT_TRUE(Shell::GetContainer(primary_root_window,
                                   kShellWindowId_VirtualKeyboardContainer));
   ASSERT_FALSE(Shell::GetContainer(secondary_root_window,
@@ skipping 168 matching lines @@
   ui->EnsureCaretInWorkArea();
   ASSERT_EQ(root_window->bounds().width(),
             text_input_client.caret_exclude_rect().width());
   ASSERT_EQ(keyboard_height, text_input_client.caret_exclude_rect().height());
 
   input_method->SetFocusedTextInputClient(NULL);
 }
 
 TEST_F(VirtualKeyboardRootWindowControllerTest,
        EnsureCaretInWorkAreaWithMultipleDisplays) {
+  // TODO: fails in mash. http://crbug.com/695640.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   UpdateDisplay("500x500,600x600");
   const int64_t primary_display_id =
       display::Screen::GetScreen()->GetPrimaryDisplay().id();
-  const int64_t secondary_display_id =
-      Shell::GetInstance()->display_manager()->GetSecondaryDisplay().id();
+  const int64_t secondary_display_id = GetSecondaryDisplay().id();
   ASSERT_NE(primary_display_id, secondary_display_id);
 
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   ASSERT_EQ(static_cast<size_t>(2), root_windows.size());
   aura::Window* primary_root_window = root_windows[0];
   aura::Window* secondary_root_window = root_windows[1];
 
   keyboard::KeyboardController* keyboard_controller =
       keyboard::KeyboardController::GetInstance();
   keyboard::KeyboardUI* ui = keyboard_controller->ui();
@@ skipping 134 matching lines @@
   keyboard_controller->ui()->GetKeyboardWindow()->SetBounds(
       gfx::Rect(0, 400, 800, 200));
   EXPECT_EQ("0,400 800x200", keyboard_container->bounds().ToString());
 
   UpdateDisplay("600x800");
   EXPECT_EQ("0,600 600x200", keyboard_container->bounds().ToString());
 }
 
 }  // namespace test
 }  // namespace ash