Last sets of tests that can move to common_unittests

ash/wm/panels/panel_layout_manager_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/common/wm/panels/panel_layout_manager.h"
 
 #include "ash/common/shelf/shelf_button.h"
 #include "ash/common/shelf/shelf_layout_manager.h"
 #include "ash/common/shelf/shelf_model.h"
 #include "ash/common/shelf/shelf_view.h"
@@ skipping 18 matching lines @@
 #include "base/compiler_specific.h"
 #include "base/i18n/rtl.h"
 #include "base/run_loop.h"
 #include "base/strings/string_number_conversions.h"
 #include "ui/aura/client/aura_constants.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #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"
 #include "ui/views/widget/widget.h"
 
 namespace ash {
 
 namespace {
 
 std::string ToDisplayName(int64_t id) {
@@ skipping 63 matching lines @@
                   manager->panel_windows_.end(), wm_panel);
     DCHECK(found != manager->panel_windows_.end());
     DCHECK(found->callout_widget);
     return found->CalloutWidget();
   }
 
   void PanelInScreen(aura::Window* panel) {
     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(
         panel_bounds_in_screen.right(), panel_bounds_in_screen.bottom());
     gfx::Rect display_bounds = display.bounds();
     EXPECT_TRUE(screen_bottom_right.x() < display_bounds.width() &&
                 screen_bottom_right.y() < display_bounds.height());
   }
 
   void PanelsNotOverlapping(aura::Window* panel1, aura::Window* panel2) {
@@ skipping 162 matching lines @@
   gfx::Rect bounds(0, 0, 201, 201);
   std::unique_ptr<aura::Window> window(CreatePanelWindow(bounds));
   EXPECT_EQ(GetPanelContainer(window.get()), window->parent());
   EXPECT_NO_FATAL_FAILURE(IsPanelAboveLauncherIcon(window.get()));
   EXPECT_NO_FATAL_FAILURE(IsCalloutAboveLauncherIcon(window.get()));
 }
 
 // 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 =
       display::test::DisplayManagerTestApi(
           Shell::GetInstance()->display_manager())
           .SetFirstDisplayAsInternalDisplay();
 
   // Create the primary display info.
   display::ManagedDisplayInfo internal_display =
       CreateDisplayInfo(internal_display_id, gfx::Rect(0, 0, 1280, 720));
@@ skipping 12 matching lines @@
   info_list.clear();
   info_list.push_back(internal_display);
 
   // Undock and bring back the native device display as primary display.
   display_manager()->OnNativeDisplaysChanged(info_list);
 }
 
 // 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 =
       display::test::DisplayManagerTestApi(
           Shell::GetInstance()->display_manager())
           .SetFirstDisplayAsInternalDisplay();
 
   // Create the primary display info.
   display::ManagedDisplayInfo internal_display =
       CreateDisplayInfo(internal_display_id, gfx::Rect(0, 0, 1280, 720));
@@ skipping 142 matching lines @@
 TEST_F(PanelLayoutManagerTest, MultiplePanelCallout) {
   gfx::Rect bounds(0, 0, 200, 200);
   std::unique_ptr<aura::Window> w1(CreatePanelWindow(bounds));
   std::unique_ptr<aura::Window> w2(CreatePanelWindow(bounds));
   std::unique_ptr<aura::Window> w3(CreatePanelWindow(bounds));
   std::unique_ptr<aura::Window> w4(CreateNormalWindow(gfx::Rect()));
   shelf_view_test()->RunMessageLoopUntilAnimationsDone();
   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());
   EXPECT_NO_FATAL_FAILURE(IsCalloutAboveLauncherIcon(w2.get()));
   wm::ActivateWindow(w3.get());
   EXPECT_NO_FATAL_FAILURE(IsCalloutAboveLauncherIcon(w3.get()));
   wm::ActivateWindow(w4.get());
   wm::ActivateWindow(w3.get());
   EXPECT_NO_FATAL_FAILURE(IsCalloutAboveLauncherIcon(w3.get()));
   w3.reset();
@@ skipping 11 matching lines @@
   wm::ActivateWindow(w1.get());
   shelf_view_test()->RunMessageLoopUntilAnimationsDone();
   // Now, windows should be stacked 1 > 2 > 3
   w1.reset();
   EXPECT_NO_FATAL_FAILURE(IsPanelAboveLauncherIcon(w2.get()));
   EXPECT_NO_FATAL_FAILURE(IsPanelAboveLauncherIcon(w3.get()));
   EXPECT_TRUE(WindowIsAbove(w2.get(), w3.get()));
 }
 
 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));
   std::unique_ptr<aura::Window> w3(CreatePanelWindow(bounds));
 
   // At this point, windows should be stacked with 1 < 2 < 3
   wm::ActivateWindow(w2.get());
   // Windows should be stacked 1 < 2 > 3
   w2.reset();
   EXPECT_NO_FATAL_FAILURE(IsPanelAboveLauncherIcon(w1.get()));
   EXPECT_NO_FATAL_FAILURE(IsPanelAboveLauncherIcon(w3.get()));
   EXPECT_TRUE(WindowIsAbove(w3.get(), w1.get()));
 }
 
 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));
   std::unique_ptr<aura::Window> w3(CreatePanelWindow(bounds));
 
   // At this point, windows should be stacked with 1 < 2 < 3
   wm::ActivateWindow(w3.get());
   // Order shouldn't change.
   w3.reset();
   EXPECT_NO_FATAL_FAILURE(IsPanelAboveLauncherIcon(w1.get()));
   EXPECT_NO_FATAL_FAILURE(IsPanelAboveLauncherIcon(w2.get()));
   EXPECT_TRUE(WindowIsAbove(w2.get(), w1.get()));
 }
 
 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));
   std::unique_ptr<aura::Window> w3(CreatePanelWindow(bounds));
 
   // At this point, windows should be stacked with 1 < 2 < 3
   wm::ActivateWindow(w2.get());
   // Windows should be stacked 1 < 2 > 3
   w1.reset();
   EXPECT_NO_FATAL_FAILURE(IsPanelAboveLauncherIcon(w2.get()));
@@ skipping 71 matching lines @@
   wm::GetWindowState(window.get())->Unminimize();
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsPanelCalloutVisible(window.get()));
   // Activate the window, ensure callout is visible.
   wm::ActivateWindow(window.get());
   RunAllPendingInMessageLoop();
   EXPECT_TRUE(IsPanelCalloutVisible(window.get()));
 }
 
 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");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
 
   std::unique_ptr<aura::Window> p1_d1(
       CreatePanelWindow(gfx::Rect(0, 0, 50, 50)));
   std::unique_ptr<aura::Window> p2_d1(
       CreatePanelWindow(gfx::Rect(0, 0, 50, 50)));
   std::unique_ptr<aura::Window> p1_d2(
@@ skipping 226 matching lines @@
   touch.set_location(gfx::Point(bounds.x() - 1, bounds.y() + 5));
   target = targeter->FindTargetForEvent(root, &touch);
   EXPECT_NE(w.get(), target);
 }
 
 INSTANTIATE_TEST_CASE_P(LtrRtl,
                         PanelLayoutManagerTextDirectionTest,
                         testing::Bool());
 
 }  // namespace ash