Undo all existing overscan settings before updating to a new overscan settings (2nd)

ash/display/display_controller_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/display/display_controller.h"
 
 #include "ash/display/display_manager.h"
 #include "ash/launcher/launcher.h"
 #include "ash/screen_ash.h"
 #include "ash/shell.h"
@@ skipping 81 matching lines @@
     EXPECT_EQ("0,0 444x333", primary.bounds().ToString());
     EXPECT_EQ(2, gfx::Screen::GetNativeScreen()->GetNumDisplays());
   }
 };
 
 }  // namespace
 
 typedef test::AshTestBase DisplayControllerTest;
 
 #if defined(OS_WIN)
-// TOD(oshima): Windows creates a window with smaller client area.
+// TODO(oshima): Windows creates a window with smaller client area.
 // Fix this and enable tests.
 #define MAYBE_SecondaryDisplayLayout DISABLED_SecondaryDisplayLayout
 #define MAYBE_BoundsUpdated DISABLED_BoundsUpdated
 #define MAYBE_UpdateDisplayWithHostOrigin DISABLED_UpdateDisplayWithHostOrigin
+#define MAYBE_CursorDeviceScaleFactorSwapPrimary \
+  DISABLED_CursorDeviceScaleFactorSwapPrimary
 #define MAYBE_Shutdown DISABLED_Shutdown
 #else
 #define MAYBE_SecondaryDisplayLayout SecondaryDisplayLayout
 #define MAYBE_BoundsUpdated BoundsUpdated
+#define MAYBE_CursorDeviceScaleFactorSwapPrimary \
+  CursorDeviceScaleFactorSwapPrimary
 #define MAYBE_UpdateDisplayWithHostOrigin UpdateDisplayWithHostOrigin
 #define MAYBE_Shutdown Shutdown
 #endif
 
 TEST_F(DisplayControllerShutdownTest, MAYBE_Shutdown) {
   UpdateDisplay("444x333, 200x200");
 }
 
 // Flaky - crbug.com/161857
 TEST_F(DisplayControllerTest, MAYBE_SecondaryDisplayLayout) {
@@ skipping 370 matching lines @@
   EXPECT_EQ(third_display.id(), ScreenAsh::GetSecondaryDisplay().id());
   EXPECT_EQ(
       primary_root,
       display_controller->GetRootWindowForDisplayId(primary_display.id()));
   EXPECT_NE(
       primary_root,
       display_controller->GetRootWindowForDisplayId(third_display.id()));
   EXPECT_TRUE(primary_root->Contains(launcher_window));
 }
 
-TEST_F(DisplayControllerTest, CursorDeviceScaleFactorSwapPrimary) {
+TEST_F(DisplayControllerTest, MAYBE_CursorDeviceScaleFactorSwapPrimary) {
   DisplayController* display_controller =
       Shell::GetInstance()->display_controller();
 
   UpdateDisplay("200x200,200x200*2");
   gfx::Display primary_display = Shell::GetScreen()->GetPrimaryDisplay();
   gfx::Display secondary_display = ScreenAsh::GetSecondaryDisplay();
 
   aura::RootWindow* primary_root =
       display_controller->GetRootWindowForDisplayId(primary_display.id());
   aura::RootWindow* secondary_root =
@@ skipping 67 matching lines @@
   UpdateDisplay("100+200-100x200,300+500-200x300");
   ASSERT_EQ(2, Shell::GetScreen()->GetNumDisplays());
   EXPECT_EQ("100,200", root_windows[0]->GetHostOrigin().ToString());
   EXPECT_EQ("100x200", root_windows[0]->GetHostSize().ToString());
   EXPECT_EQ("300,500", root_windows[1]->GetHostOrigin().ToString());
   EXPECT_EQ("200x300", root_windows[1]->GetHostSize().ToString());
 }
 
 }  // namespace test
 }  // namespace ash