Enable shelf and panel ash_unittests in mash

These tests appear to pass as-is on ToT @ #534716.

Bug: 695563, 698887, 775177
Test: Automated
Change-Id: I6d3979aec6738e4d14c2119faa3488d0ee1c596e
Reviewed-on: https://chromium-review.googlesource.com/905687Reviewed-by: James Cook <jamescook@chromium.org>
Commit-Queue: Michael Wasserman <msw@chromium.org>
Cr-Commit-Position: refs/heads/master@{#534850}

ash/shelf/shelf_tooltip_manager_unittest.cc

@@ -164,10 +164,6 @@ TEST_F(ShelfTooltipManagerTest, HideWhenShelfIsAutoHideHidden) {
 }
 
 TEST_F(ShelfTooltipManagerTest, HideForEvents) {
-  // TODO: investigate failure in mash. http://crbug.com/695563.
-  if (Shell::GetAshConfig() == Config::MASH)
-    return;
-
   ui::test::EventGenerator& generator = GetEventGenerator();
   gfx::Rect shelf_bounds = shelf_view_->GetBoundsInScreen();
 
@@ -200,10 +196,6 @@ TEST_F(ShelfTooltipManagerTest, HideForEvents) {
 }
 
 TEST_F(ShelfTooltipManagerTest, HideForExternalEvents) {
-  // TODO: investigate failure in mash. http://crbug.com/695563.
-  if (Shell::GetAshConfig() == Config::MASH)
-    return;
-
   ui::test::EventGenerator& generator = GetEventGenerator();
 
   // Should hide for touches outside the shelf.

ash/wm/panels/panel_layout_manager_unittest.cc

@@ -469,15 +469,11 @@ TEST_F(PanelLayoutManagerTest, MultiplePanelStackingVertical) {
   wm::ActivateWindow(w1.get());
   shelf_view_test()->RunMessageLoopUntilAnimationsDone();
   EXPECT_TRUE(WindowIsAbove(w1.get(), w2.get()));
-  // TODO(crbug.com/698887): investigate failure in Mash.
-  if (Shell::GetAshConfig() != Config::MASH)
-    EXPECT_TRUE(WindowIsAbove(w2.get(), w3.get()));
+  EXPECT_TRUE(WindowIsAbove(w2.get(), w3.get()));
 
   wm::ActivateWindow(w2.get());
   shelf_view_test()->RunMessageLoopUntilAnimationsDone();
-  // TODO(crbug.com/698887): investigate failure in Mash.
-  if (Shell::GetAshConfig() != Config::MASH)
-    EXPECT_TRUE(WindowIsAbove(w1.get(), w3.get()));
+  EXPECT_TRUE(WindowIsAbove(w1.get(), w3.get()));
   EXPECT_TRUE(WindowIsAbove(w2.get(), w3.get()));
   EXPECT_TRUE(WindowIsAbove(w2.get(), w1.get()));
 
@@ -497,10 +493,6 @@ TEST_F(PanelLayoutManagerTest, MultiplePanelCallout) {
   EXPECT_TRUE(IsPanelCalloutVisible(w2.get()));
   EXPECT_TRUE(IsPanelCalloutVisible(w3.get()));
 
-  // TODO(crbug.com/698887): investigate failure in Mash.
-  if (Shell::GetAshConfig() == Config::MASH)
-    return;
-
   wm::ActivateWindow(w1.get());
   EXPECT_NO_FATAL_FAILURE(IsCalloutAboveLauncherIcon(w1.get()));
   wm::ActivateWindow(w2.get());
@@ -606,9 +598,7 @@ TEST_F(PanelLayoutManagerTest, FanWindows) {
   Shelf* shelf = GetPrimaryShelf();
   int icon_x1 = shelf->GetScreenBoundsOfItemIconForWindow(w1.get()).x();
   int icon_x2 = shelf->GetScreenBoundsOfItemIconForWindow(w2.get()).x();
-  // TODO(crbug.com/698887): investigate failure in Mash.
-  if (Shell::GetAshConfig() != Config::MASH)
-    EXPECT_EQ(window_x2 - window_x1, window_x3 - window_x2);
+  EXPECT_EQ(window_x2 - window_x1, window_x3 - window_x2);
   // New shelf items for panels are inserted before existing panel items.
   EXPECT_LT(window_x2, window_x1);
   EXPECT_LT(window_x3, window_x2);