From e75642a8f1dd697ee69dd4849f44d3ae85f51ca8 Mon Sep 17 00:00:00 2001 From: "oshima@chromium.org" Date: Wed, 12 Jun 2013 17:21:18 +0000 Subject: Skip mulitple-display tests on win8 Re-enable tests that should pass on win7. BUG=247427 Review URL: https://chromiumcodereview.appspot.com/16539005 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@205846 0039d316-1c4b-4281-b951-d872f2087c98 --- ash/drag_drop/drag_drop_controller_unittest.cc | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'ash/drag_drop') diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc index ea25e38..7ca79ea0 100644 --- a/ash/drag_drop/drag_drop_controller_unittest.cc +++ b/ash/drag_drop/drag_drop_controller_unittest.cc @@ -1012,16 +1012,12 @@ class DragImageWindowObserver : public aura::WindowObserver { } -#if defined(OS_WIN) -// Multiple displays are not supported on Windows Ash. http://crbug.com/165962 -#define MAYBE_DragCancelAcrossDisplays DISABLED_DragCancelAcrossDisplays -#else -#define MAYBE_DragCancelAcrossDisplays DragCancelAcrossDisplays -#endif - // Verifies the drag image moves back to the position where drag is started // across displays when drag is cancelled. -TEST_F(DragDropControllerTest, MAYBE_DragCancelAcrossDisplays) { +TEST_F(DragDropControllerTest, DragCancelAcrossDisplays) { + if (!SupportsMultipleDisplays()) + return; + UpdateDisplay("400x400,400x400"); Shell::RootWindowList root_windows = Shell::GetInstance()->GetAllRootWindows(); -- cgit v1.1