Last sets of tests that can move to common_unittests

ash/wm/panels/panel_layout_manager_unittest.cc

Index: ash/wm/panels/panel_layout_manager_unittest.cc
diff --git a/ash/wm/panels/panel_layout_manager_unittest.cc b/ash/wm/panels/panel_layout_manager_unittest.cc
index 3b11ebbafa5bd703ecca96dccc8632966f94282d..6e840d5f53c150c72b4a623d0e88314a3454bf0b 100644
--- a/ash/wm/panels/panel_layout_manager_unittest.cc
+++ b/ash/wm/panels/panel_layout_manager_unittest.cc
@@ -36,6 +36,7 @@
 #include "ui/aura/window_event_dispatcher.h"
 #include "ui/display/manager/display_manager.h"
 #include "ui/display/manager/managed_display_info.h"
+#include "ui/display/screen.h"
 #include "ui/display/test/display_manager_test_api.h"
 #include "ui/events/event_utils.h"
 #include "ui/events/test/event_generator.h"
@@ -119,7 +120,7 @@ class PanelLayoutManagerTest : public test::AshTestBase {
     gfx::Rect panel_bounds = panel->GetBoundsInRootWindow();
     gfx::Point root_point = gfx::Point(panel_bounds.x(), panel_bounds.y());
     display::Display display =
-        display_manager()->FindDisplayContainingPoint(root_point);
+        display::Screen::GetScreen()->GetDisplayNearestPoint(root_point);
 
     gfx::Rect panel_bounds_in_screen = panel->GetBoundsInScreen();
     gfx::Point screen_bottom_right = gfx::Point(
@@ -302,6 +303,11 @@ TEST_P(PanelLayoutManagerTextDirectionTest, AddOnePanel) {
 // Tests for crashes during undocking.
 // See https://crbug.com/632755
 TEST_F(PanelLayoutManagerTest, UndockTest) {
+  // TODO: mash doesn't support SetFirstDisplayAsInternalDisplay().
+  // http://crbug.com/698091.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   std::vector<display::ManagedDisplayInfo> info_list;
 
   const int64_t internal_display_id =
@@ -334,6 +340,11 @@ TEST_F(PanelLayoutManagerTest, UndockTest) {
 // Tests for any crash during docking and then undocking.
 // See https://crbug.com/632755
 TEST_F(PanelLayoutManagerTest, DockUndockTest) {
+  // TODO: mash doesn't support SetFirstDisplayAsInternalDisplay().
+  // http://crbug.com/698091.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   std::vector<display::ManagedDisplayInfo> info_list;
 
   const int64_t internal_display_id =
@@ -496,6 +507,11 @@ TEST_F(PanelLayoutManagerTest, MultiplePanelCallout) {
   EXPECT_TRUE(IsPanelCalloutVisible(w1.get()));
   EXPECT_TRUE(IsPanelCalloutVisible(w2.get()));
   EXPECT_TRUE(IsPanelCalloutVisible(w3.get()));
+
+  // TODO: investigate failure. http://crbug.com/698887.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   wm::ActivateWindow(w1.get());
   EXPECT_NO_FATAL_FAILURE(IsCalloutAboveLauncherIcon(w1.get()));
   wm::ActivateWindow(w2.get());
@@ -527,6 +543,10 @@ TEST_F(PanelLayoutManagerTest, RemoveLeftPanel) {
 }
 
 TEST_F(PanelLayoutManagerTest, RemoveMiddlePanel) {
+  // TODO: fails because of ShelfModel. http://crbug.com/698878.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   gfx::Rect bounds(0, 0, 201, 201);
   std::unique_ptr<aura::Window> w1(CreatePanelWindow(bounds));
   std::unique_ptr<aura::Window> w2(CreatePanelWindow(bounds));
@@ -542,6 +562,10 @@ TEST_F(PanelLayoutManagerTest, RemoveMiddlePanel) {
 }
 
 TEST_F(PanelLayoutManagerTest, RemoveRightPanel) {
+  // TODO: fails because of ShelfModel. http://crbug.com/698878.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   gfx::Rect bounds(0, 0, 201, 201);
   std::unique_ptr<aura::Window> w1(CreatePanelWindow(bounds));
   std::unique_ptr<aura::Window> w2(CreatePanelWindow(bounds));
@@ -557,6 +581,10 @@ TEST_F(PanelLayoutManagerTest, RemoveRightPanel) {
 }
 
 TEST_F(PanelLayoutManagerTest, RemoveNonActivePanel) {
+  // TODO: fails because of ShelfModel. http://crbug.com/698878.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   gfx::Rect bounds(0, 0, 201, 201);
   std::unique_ptr<aura::Window> w1(CreatePanelWindow(bounds));
   std::unique_ptr<aura::Window> w2(CreatePanelWindow(bounds));
@@ -648,6 +676,10 @@ TEST_F(PanelLayoutManagerTest, MinimizeRestorePanel) {
 }
 
 TEST_F(PanelLayoutManagerTest, PanelMoveBetweenMultipleDisplays) {
+  // TODO: fails because of ShelfModel. http://crbug.com/698878.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   // Keep the displays wide so that shelves have enough space for launcher
   // buttons.
   UpdateDisplay("600x400,600x400");