Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(892)

Unified Diff: ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc

Issue 2732573002: chromeos: moves more ash tests to run on mash (Closed)
Patch Set: fix bug ref Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/lock_state_controller_unittest.cc ('k') | ash/wm/overview/window_selector_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc
diff --git a/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc b/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc
index b94bfc40986d77ad5c7e07eb980b78c554333292..b2f9411ed1e309a038e18c9c2ef0159031c4e388 100644
--- a/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc
+++ b/ash/wm/maximize_mode/maximize_mode_window_manager_unittest.cc
@@ -1292,6 +1292,10 @@ TEST_F(MaximizeModeWindowManagerTest, ExitsOverview) {
// Test that an edge swipe from the top will end full screen mode.
TEST_F(MaximizeModeWindowManagerTest, ExitFullScreenWithEdgeSwipeFromTop) {
+ // TODO: investigate failure. http://crbug.com/698093.
+ if (WmShell::Get()->IsRunningInMash())
+ return;
+
gfx::Rect rect(10, 10, 200, 50);
std::unique_ptr<aura::Window> background_window(
CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
@@ -1332,6 +1336,10 @@ TEST_F(MaximizeModeWindowManagerTest, ExitFullScreenWithEdgeSwipeFromTop) {
// Test that an edge swipe from the bottom will end full screen mode.
TEST_F(MaximizeModeWindowManagerTest, ExitFullScreenWithEdgeSwipeFromBottom) {
+ // TODO: investigate failure. http://crbug.com/698093.
+ if (WmShell::Get()->IsRunningInMash())
+ return;
+
gfx::Rect rect(10, 10, 200, 50);
std::unique_ptr<aura::Window> background_window(
CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
@@ -1366,6 +1374,10 @@ TEST_F(MaximizeModeWindowManagerTest, ExitFullScreenWithEdgeSwipeFromBottom) {
// Test that an edge touch press at the top will end full screen mode.
TEST_F(MaximizeModeWindowManagerTest, ExitFullScreenWithEdgeTouchAtTop) {
+ // TODO: investigate failure. http://crbug.com/698093.
+ if (WmShell::Get()->IsRunningInMash())
+ return;
+
gfx::Rect rect(10, 10, 200, 50);
std::unique_ptr<aura::Window> background_window(
CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
@@ -1402,6 +1414,10 @@ TEST_F(MaximizeModeWindowManagerTest, ExitFullScreenWithEdgeTouchAtTop) {
// Test that an edge touch press at the bottom will end full screen mode.
TEST_F(MaximizeModeWindowManagerTest, ExitFullScreenWithEdgeTouchAtBottom) {
+ // TODO: investigate failure. http://crbug.com/698093.
+ if (WmShell::Get()->IsRunningInMash())
+ return;
+
gfx::Rect rect(10, 10, 200, 50);
std::unique_ptr<aura::Window> background_window(
CreateWindow(ui::wm::WINDOW_TYPE_NORMAL, rect));
« no previous file with comments | « ash/wm/lock_state_controller_unittest.cc ('k') | ash/wm/overview/window_selector_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698