Cancel drag if display configuration changes.

ash/wm/workspace/workspace_window_resizer_unittest.cc

Index: ash/wm/workspace/workspace_window_resizer_unittest.cc
diff --git a/ash/wm/workspace/workspace_window_resizer_unittest.cc b/ash/wm/workspace/workspace_window_resizer_unittest.cc
index c831d12e11bbb38e4e9a8d5f75a4d2f5cf4098e0..6b5c5e1334cb12b10efa26936c84a0b815f8cbe3 100644
--- a/ash/wm/workspace/workspace_window_resizer_unittest.cc
+++ b/ash/wm/workspace/workspace_window_resizer_unittest.cc
@@ -140,15 +140,15 @@ class WorkspaceWindowResizerTest : public test::AshTestBase {
 // Fails on win_aura since wm::GetRootWindowRelativeToWindow is not implemented
 // yet for the platform.
 #if defined(OS_WIN)
-#define MAYBE_WindowDragWithMultiMonitors \
-  DISABLED_WindowDragWithMultiMonitors
-#define MAYBE_WindowDragWithMultiMonitorsRightToLeft \
-  DISABLED_WindowDragWithMultiMonitorsRightToLeft
+#define MAYBE_WindowDragWithMultiDisplays \
+  DISABLED_WindowDragWithMultiDisplays
+#define MAYBE_WindowDragWithMultiDisplaysRightToLeft \
+  DISABLED_WindowDragWithMultiDisplaysRightToLeft
 #define MAYBE_PhantomStyle DISABLED_PhantomStyle
 #else
-#define MAYBE_WindowDragWithMultiMonitors WindowDragWithMultiMonitors
-#define MAYBE_WindowDragWithMultiMonitorsRightToLeft \
-  WindowDragWithMultiMonitorsRightToLeft
+#define MAYBE_WindowDragWithMultiDisplays WindowDragWithMultiDisplays
+#define MAYBE_WindowDragWithMultiDisplaysRightToLeft \
+  WindowDragWithMultiDisplaysRightToLeft
 #define MAYBE_PhantomStyle PhantomStyle
 #endif
 
@@ -486,7 +486,7 @@ TEST_F(WorkspaceWindowResizerTest, Edge) {
 }
 
 // Verifies a window can be moved from the primary display to another.
-TEST_F(WorkspaceWindowResizerTest, MAYBE_WindowDragWithMultiMonitors) {
+TEST_F(WorkspaceWindowResizerTest, MAYBE_WindowDragWithMultiDisplays) {
   // The secondary display is logically on the right, but on the system (e.g. X)
   // layer, it's below the primary one. See UpdateDisplay() in ash_test_base.cc.
   UpdateDisplay("800x600,800x600");
@@ -553,7 +553,7 @@ TEST_F(WorkspaceWindowResizerTest, MAYBE_WindowDragWithMultiMonitors) {
 
 // Verifies a window can be moved from the secondary display to primary.
 TEST_F(WorkspaceWindowResizerTest,
-       MAYBE_WindowDragWithMultiMonitorsRightToLeft) {
+       MAYBE_WindowDragWithMultiDisplaysRightToLeft) {
   UpdateDisplay("800x600,800x600");
   Shell::GetInstance()->shelf()->LayoutShelf();
   Shell::RootWindowList root_windows = Shell::GetAllRootWindows();