chromeos: moves more ash tests to run on mash

ash/system/overview/overview_button_tray_unittest.cc

 // Copyright 2014 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/system/overview/overview_button_tray.h"
 
 #include "ash/common/login_status.h"
 #include "ash/common/system/status_area_widget.h"
 #include "ash/common/test/test_session_state_delegate.h"
 #include "ash/common/wm/maximize_mode/maximize_mode_controller.h"
@@ skipping 29 matching lines @@
       ->overview_button_tray();
 }
 
 OverviewButtonTray* GetSecondaryTray() {
   return StatusAreaWidgetTestHelper::GetSecondaryStatusAreaWidget()
       ->overview_button_tray();
 }
 
 }  // namespace
 
-// TODO(jamescook): Migrate to //ash/common/system. http://crbug.com/620955
 class OverviewButtonTrayTest : public test::AshTestBase {
  public:
   OverviewButtonTrayTest() {}
   ~OverviewButtonTrayTest() override {}
 
   void SetUp() override;
 
   void NotifySessionStateChanged();
 
  protected:
@@ skipping 43 matching lines @@
   std::unique_ptr<aura::Window> window(
       CreateTestWindowInShellWithBounds(gfx::Rect(5, 5, 20, 20)));
   ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
                        ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   GetTray()->PerformAction(tap);
   EXPECT_TRUE(WmShell::Get()->window_selector_controller()->IsSelecting());
 }
 
 // Tests that tapping on the control will record the user action Tray_Overview.
 TEST_F(OverviewButtonTrayTest, TrayOverviewUserAction) {
+  // TODO: investigate failure in mash, http://crbug.com/698129.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   ASSERT_FALSE(WmShell::Get()->window_selector_controller()->IsSelecting());
 
   // Tapping on the control when there are no windows (and thus the user cannot
   // enter overview mode) should still record the action.
   base::UserActionTester user_action_tester;
   ui::GestureEvent tap(0, 0, 0, base::TimeTicks(),
                        ui::GestureEventDetails(ui::ET_GESTURE_TAP));
   GetTray()->PerformAction(tap);
   ASSERT_FALSE(WmShell::Get()->window_selector_controller()->IsSelecting());
   EXPECT_EQ(1, user_action_tester.GetActionCount(kTrayOverview));
@@ skipping 76 matching lines @@
   EXPECT_TRUE(GetTray()->is_active());
 
   EXPECT_TRUE(WmShell::Get()->window_selector_controller()->ToggleOverview());
   EXPECT_FALSE(WmShell::Get()->window_selector_controller()->IsSelecting());
   EXPECT_FALSE(GetTray()->is_active());
 }
 
 // Test that when a hide animation is aborted via deletion, that the
 // OverviewButton is still hidden.
 TEST_F(OverviewButtonTrayTest, HideAnimationAlwaysCompletes) {
+  // TODO: disabled as ScreenRotationAnimator does not work in mash,
+  // http://crbug.com/696754.
+  if (WmShell::Get()->IsRunningInMash())
+    return;
+
   WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
 
   // Long duration for hide animation, to allow it to be interrupted.
   std::unique_ptr<ui::ScopedAnimationDurationScaleMode> hide_duration(
       new ui::ScopedAnimationDurationScaleMode(
           ui::ScopedAnimationDurationScaleMode::SLOW_DURATION));
   GetTray()->SetVisible(false);
 
   // ScreenRotationAnimator copies the current layers, and deletes them upon
@@ skipping 25 matching lines @@
   ASSERT_TRUE(WmShell::Get()->IsSystemModalWindowOpen());
   WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       true);
   EXPECT_TRUE(GetTray()->visible());
   WmShell::Get()->maximize_mode_controller()->EnableMaximizeModeWindowManager(
       false);
   EXPECT_FALSE(GetTray()->visible());
 }
 
 }  // namespace ash