Cancel drag if display configuration changes.

ash/display/multi_display_manager_unittest.cc

Index: ash/display/multi_display_manager_unittest.cc
diff --git a/ash/display/multi_display_manager_unittest.cc b/ash/display/multi_display_manager_unittest.cc
index 8320498abe57c2ca7fa5cd8288bccb04a5a0fc91..ea6ac2cab4894bfe7a0921269c78c427d52332ca 100644
--- a/ash/display/multi_display_manager_unittest.cc
+++ b/ash/display/multi_display_manager_unittest.cc
@@ -196,29 +196,20 @@ TEST_F(MultiDisplayManagerTest, MAYBE_NativeDisplayTest) {
 TEST_F(MultiDisplayManagerTest, MAYBE_EmulatorTest) {
   EXPECT_EQ(1U, display_manager()->GetNumDisplays());
 
-  MultiDisplayManager::AddRemoveDisplay();
+  MultiDisplayManager::CycleDisplay();
   // Update primary and add seconary.
   EXPECT_EQ(2U, display_manager()->GetNumDisplays());
-  EXPECT_EQ("1 1 0", GetCountSummary());
+  EXPECT_EQ("0 1 0", GetCountSummary());
   reset();
 
   MultiDisplayManager::CycleDisplay();
-  EXPECT_EQ(2U, display_manager()->GetNumDisplays());
-  // Observer gets called twice in this mode because
-  // it gets notified both from |OnNativeDisplayChagned|
-  // and from |RootWindowObserver|, which is the consequence of
-  // |SetHostSize()|.
-  EXPECT_EQ("4 0 0", GetCountSummary());
-  reset();
-
-  MultiDisplayManager::AddRemoveDisplay();
   EXPECT_EQ(1U, display_manager()->GetNumDisplays());
   EXPECT_EQ("0 0 1", GetCountSummary());
   reset();
 
   MultiDisplayManager::CycleDisplay();
-  EXPECT_EQ(1U, display_manager()->GetNumDisplays());
-  EXPECT_EQ("0 0 0", GetCountSummary());
+  EXPECT_EQ(2U, display_manager()->GetNumDisplays());
+  EXPECT_EQ("0 1 0", GetCountSummary());
   reset();
 }