Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / ash / drag_drop / drag_drop_tracker_unittest.cc

diff --git a/src/ash/drag_drop/drag_drop_tracker_unittest.cc b/src/ash/drag_drop/drag_drop_tracker_unittest.cc
index 6b470e8..24c5e89 100644 (file)
--- a/src/ash/drag_drop/drag_drop_tracker_unittest.cc
+++ b/src/ash/drag_drop/drag_drop_tracker_unittest.cc
@@ -19,7 +19,6 @@ class DragDropTrackerTest : public test::AshTestBase {
  public:
   virtual void SetUp() OVERRIDE {
     AshTestBase::SetUp();
-    UpdateDisplay("200x200,300x300");
   }
 
   aura::Window* CreateTestWindow(const gfx::Rect& bounds) {
@@ -51,15 +50,11 @@ class DragDropTrackerTest : public test::AshTestBase {
   }
 };
 
-// TODO(mazda): Remove this once ash/wm/coordinate_conversion.h supports
-// non-X11 platforms.
-#if defined(USE_X11)
-#define MAYBE_GetTarget GetTarget
-#else
-#define MAYBE_GetTarget DISABLED_GetTarget
-#endif
+TEST_F(DragDropTrackerTest, GetTarget) {
+  if (!SupportsMultipleDisplays())
+    return;
 
-TEST_F(DragDropTrackerTest, MAYBE_GetTarget) {
+  UpdateDisplay("200x200,300x300");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   EXPECT_EQ(2U, root_windows.size());
 
@@ -118,15 +113,11 @@ TEST_F(DragDropTrackerTest, MAYBE_GetTarget) {
   EXPECT_NE(window1.get(), GetTarget(gfx::Point(50, 50)));
 }
 
-// TODO(mazda): Remove this once ash/wm/coordinate_conversion.h supports
-// non-X11 platforms.
-#if defined(USE_X11)
-#define MAYBE_ConvertEvent ConvertEvent
-#else
-#define MAYBE_ConvertEvent DISABLED_ConvertEvent
-#endif
+TEST_F(DragDropTrackerTest, ConvertEvent) {
+  if (!SupportsMultipleDisplays())
+    return;
 
-TEST_F(DragDropTrackerTest, MAYBE_ConvertEvent) {
+  UpdateDisplay("200x200,300x300");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   EXPECT_EQ(2U, root_windows.size());