Last sets of tests that can move to common_unittests

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 ede38a7593b23f6b21c073fca8ca9ee87d49a697..72cf2463db04cf34516ce9358a88268aa51078f4 100644
--- a/ash/wm/system_modal_container_layout_manager_unittest.cc
+++ b/ash/wm/system_modal_container_layout_manager_unittest.cc
@@ -152,13 +152,19 @@ class SystemModalContainerLayoutManagerTest : public AshTestBase {
     base::CommandLine::ForCurrentProcess()->AppendSwitch(
         keyboard::switches::kEnableVirtualKeyboard);
     AshTestBase::SetUp();
-    Shell::GetPrimaryRootWindowController()->ActivateKeyboard(
-        keyboard::KeyboardController::GetInstance());
+    // TODO: mash doesn't support keyboard. http://crbug.com/698892.

[msw, 2017/03/07 21:36:01]

nit: virtual keyboard here and below?

[sky, 2017/03/07 21:43:30]

Done.

+    if (!WmShell::Get()->IsRunningInMash()) {
+      Shell::GetPrimaryRootWindowController()->ActivateKeyboard(
+          keyboard::KeyboardController::GetInstance());
+    }
   }
 
   void TearDown() override {
-    Shell::GetPrimaryRootWindowController()->DeactivateKeyboard(
-        keyboard::KeyboardController::GetInstance());
+    // TODO: mash doesn't support keyboard. http://crbug.com/698892.
+    if (!WmShell::Get()->IsRunningInMash()) {
+      Shell::GetPrimaryRootWindowController()->DeactivateKeyboard(
+          keyboard::KeyboardController::GetInstance());
+    }
     AshTestBase::TearDown();
   }
 
@@ -641,6 +647,10 @@ TEST_F(SystemModalContainerLayoutManagerTest, MultiDisplays) {
 // positioned into the visible area.
 TEST_F(SystemModalContainerLayoutManagerTest,
        SystemModalDialogGetPushedFromKeyboard) {
+  // TODO: mash doesn't support keyboard. http://crbug.com/698892.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   const gfx::Rect& container_bounds = GetModalContainer()->bounds();
   // Place the window at the bottom of the screen.
   gfx::Size modal_size(100, 100);
@@ -677,6 +687,10 @@ TEST_F(SystemModalContainerLayoutManagerTest,
 // if centered.
 TEST_F(SystemModalContainerLayoutManagerTest,
        SystemModalDialogGetPushedButNotCroppedFromKeyboard) {
+  // TODO: mash doesn't support keyboard. http://crbug.com/698892.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   const gfx::Rect& container_bounds = GetModalContainer()->bounds();
   const gfx::Size screen_size = Shell::GetPrimaryRootWindow()->bounds().size();
   // Place the window at the bottom of the screen.
@@ -710,6 +724,10 @@ TEST_F(SystemModalContainerLayoutManagerTest,
 // if not centered.
 TEST_F(SystemModalContainerLayoutManagerTest,
        SystemModalDialogGetPushedButNotCroppedFromKeyboardIfNotCentered) {
+  // TODO: mash doesn't support keyboard. http://crbug.com/698892.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   const gfx::Size screen_size = Shell::GetPrimaryRootWindow()->bounds().size();
   // Place the window at the bottom of the screen.
   gfx::Size modal_size(100, screen_size.height() - 70);