Fix moving the mouse between two displays after the secondary display becomes primary.

ash/display/extended_mouse_warp_controller_unittest.cc

Index: ash/display/extended_mouse_warp_controller_unittest.cc
diff --git a/ash/display/extended_mouse_warp_controller_unittest.cc b/ash/display/extended_mouse_warp_controller_unittest.cc
index 331ef88f34223fdc3473c3e4f02c4f7082be29d7..aa1b5842f3b121f0a42f6fd0ec23fd2927e75edc 100644
--- a/ash/display/extended_mouse_warp_controller_unittest.cc
+++ b/ash/display/extended_mouse_warp_controller_unittest.cc
@@ -215,46 +215,54 @@ TEST_F(ExtendedMouseWarpControllerTest, IndicatorBoundsTestThreeDisplays) {
   if (!SupportsMultipleDisplays())
     return;
 
-  UpdateDisplay("360x360,700x700,1000x1000");
-  aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+  auto run_test = [this] {
+    aura::Window::Windows root_windows = Shell::GetAllRootWindows();
+
+    // Left most display
+    event_filter()->ShowSharedEdgeIndicator(root_windows[0]);
+    ASSERT_EQ(2U, mouse_warp_controller()->warp_regions_.size());
+    EXPECT_EQ(gfx::Rect(359, 16, 1, 344),
+              mouse_warp_controller()->warp_regions_[0]->a_indicator_bounds);
+    EXPECT_EQ(gfx::Rect(360, 0, 1, 360),
+              mouse_warp_controller()->warp_regions_[0]->b_indicator_bounds);
+    EXPECT_EQ(gfx::Rect(1060, 16, 1, 684),
+              mouse_warp_controller()->warp_regions_[1]->a_indicator_bounds);
+    EXPECT_EQ(gfx::Rect(1059, 0, 1, 700),
+              mouse_warp_controller()->warp_regions_[1]->b_indicator_bounds);
+
+    // Middle display
+    event_filter()->ShowSharedEdgeIndicator(root_windows[1]);
+    ASSERT_EQ(2U, mouse_warp_controller()->warp_regions_.size());
+    EXPECT_EQ(gfx::Rect(360, 16, 1, 344),
+              mouse_warp_controller()->warp_regions_[0]->a_indicator_bounds);
+    EXPECT_EQ(gfx::Rect(359, 0, 1, 360),
+              mouse_warp_controller()->warp_regions_[0]->b_indicator_bounds);
+    EXPECT_EQ(gfx::Rect(1059, 16, 1, 684),
+              mouse_warp_controller()->warp_regions_[1]->a_indicator_bounds);
+    EXPECT_EQ(gfx::Rect(1060, 0, 1, 700),
+              mouse_warp_controller()->warp_regions_[1]->b_indicator_bounds);
+
+    // Right most display
+    event_filter()->ShowSharedEdgeIndicator(root_windows[2]);
+    ASSERT_EQ(2U, mouse_warp_controller()->warp_regions_.size());
+    EXPECT_EQ(gfx::Rect(360, 16, 1, 344),
+              mouse_warp_controller()->warp_regions_[0]->a_indicator_bounds);
+    EXPECT_EQ(gfx::Rect(359, 0, 1, 360),
+              mouse_warp_controller()->warp_regions_[0]->b_indicator_bounds);
+    EXPECT_EQ(gfx::Rect(1060, 16, 1, 684),
+              mouse_warp_controller()->warp_regions_[1]->a_indicator_bounds);
+    EXPECT_EQ(gfx::Rect(1059, 0, 1, 700),
+              mouse_warp_controller()->warp_regions_[1]->b_indicator_bounds);
+
+    event_filter()->HideSharedEdgeIndicator();
+  };
 
-  // Left most display
-  event_filter()->ShowSharedEdgeIndicator(root_windows[0]);
-  ASSERT_EQ(2U, mouse_warp_controller()->warp_regions_.size());
-  EXPECT_EQ(gfx::Rect(359, 16, 1, 344),
-            mouse_warp_controller()->warp_regions_[0]->a_indicator_bounds);
-  EXPECT_EQ(gfx::Rect(360, 0, 1, 360),
-            mouse_warp_controller()->warp_regions_[0]->b_indicator_bounds);
-  EXPECT_EQ(gfx::Rect(1060, 16, 1, 684),
-            mouse_warp_controller()->warp_regions_[1]->a_indicator_bounds);
-  EXPECT_EQ(gfx::Rect(1059, 0, 1, 700),
-            mouse_warp_controller()->warp_regions_[1]->b_indicator_bounds);
-
-  // Middle display
-  event_filter()->ShowSharedEdgeIndicator(root_windows[1]);
-  ASSERT_EQ(2U, mouse_warp_controller()->warp_regions_.size());
-  EXPECT_EQ(gfx::Rect(360, 16, 1, 344),
-            mouse_warp_controller()->warp_regions_[0]->a_indicator_bounds);
-  EXPECT_EQ(gfx::Rect(359, 0, 1, 360),
-            mouse_warp_controller()->warp_regions_[0]->b_indicator_bounds);
-  EXPECT_EQ(gfx::Rect(1059, 16, 1, 684),
-            mouse_warp_controller()->warp_regions_[1]->a_indicator_bounds);
-  EXPECT_EQ(gfx::Rect(1060, 0, 1, 700),
-            mouse_warp_controller()->warp_regions_[1]->b_indicator_bounds);
-
-  // Right most display
-  event_filter()->ShowSharedEdgeIndicator(root_windows[2]);
-  ASSERT_EQ(2U, mouse_warp_controller()->warp_regions_.size());
-  EXPECT_EQ(gfx::Rect(360, 16, 1, 344),
-            mouse_warp_controller()->warp_regions_[0]->a_indicator_bounds);
-  EXPECT_EQ(gfx::Rect(359, 0, 1, 360),
-            mouse_warp_controller()->warp_regions_[0]->b_indicator_bounds);
-  EXPECT_EQ(gfx::Rect(1060, 16, 1, 684),
-            mouse_warp_controller()->warp_regions_[1]->a_indicator_bounds);
-  EXPECT_EQ(gfx::Rect(1059, 0, 1, 700),
-            mouse_warp_controller()->warp_regions_[1]->b_indicator_bounds);
+  UpdateDisplay("360x360,700x700,1000x1000");
+  run_test();
 
-  event_filter()->HideSharedEdgeIndicator();
+  UpdateDisplay("360x360,700x700,1000x1000");
+  Shell::GetInstance()->window_tree_host_manager()->SwapPrimaryDisplayForTest();
+  run_test();
 }
 
 }  // namespace ash