Cancel drag if display configuration changes.

ash/display/multi_display_manager_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/multi_display_manager.h"
 
 #include "ash/display/display_controller.h"
 #include "ash/shell.h"
 #include "ash/test/ash_test_base.h"
 #include "base/format_macros.h"
@@ skipping 177 matching lines @@
             display_manager()->GetDisplayAt(1)->bounds_in_pixel().ToString());
   reset();
 
   aura::DisplayManager::set_use_fullscreen_host_window(false);
 }
 
 // Test in emulation mode (use_fullscreen_host_window=false)
 TEST_F(MultiDisplayManagerTest, MAYBE_EmulatorTest) {
   EXPECT_EQ(1U, display_manager()->GetNumDisplays());
 
-  internal::MultiDisplayManager::AddRemoveDisplay();
+  internal::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();
 
   internal::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();
-
-  internal::MultiDisplayManager::AddRemoveDisplay();
   EXPECT_EQ(1U, display_manager()->GetNumDisplays());
   EXPECT_EQ("0 0 1", GetCountSummary());
   reset();
 
   internal::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();
 }
 
 // TODO(oshima): Device scale factor is supported on chromeos only for now.
 #if defined(OS_CHROMEOS)
 #define MAYBE_TestDeviceScaleOnlyChange TestDeviceScaleOnlyChange
 #else
 #define MAYBE_TestDeviceScaleOnlyChange DISABLED_TestDeviceScaleOnlyChange
 #endif
 
 TEST_F(MultiDisplayManagerTest, MAYBE_TestDeviceScaleOnlyChange) {
   aura::DisplayManager::set_use_fullscreen_host_window(true);
   UpdateDisplay("1000x600");
   EXPECT_EQ(1,
             Shell::GetPrimaryRootWindow()->compositor()->device_scale_factor());
   EXPECT_EQ("1000x600",
             Shell::GetPrimaryRootWindow()->bounds().size().ToString());
   UpdateDisplay("1000x600*2");
   EXPECT_EQ(2,
             Shell::GetPrimaryRootWindow()->compositor()->device_scale_factor());
   EXPECT_EQ("500x300",
             Shell::GetPrimaryRootWindow()->bounds().size().ToString());
   aura::DisplayManager::set_use_fullscreen_host_window(false);
 }
 
 }  // namespace test
 }  // namespace ash