Remove USE_X11 check in DragDropTracker unittests

ash/drag_drop/drag_drop_tracker_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/drag_drop/drag_drop_tracker.h"
 
 #include "ash/shell.h"
 #include "ash/shell_window_ids.h"
 #include "ash/test/ash_test_base.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/aura/test/test_windows.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_event_dispatcher.h"
 
 namespace ash {
 namespace test {
 
 class DragDropTrackerTest : public test::AshTestBase {
  public:
   virtual void SetUp() OVERRIDE {
     AshTestBase::SetUp();
-    UpdateDisplay("200x200,300x300");
   }
 
   aura::Window* CreateTestWindow(const gfx::Rect& bounds) {
     static int window_id = 0;
     return CreateTestWindowInShellWithDelegate(
         aura::test::TestWindowDelegate::CreateSelfDestroyingDelegate(),
         window_id++,
         bounds);
   }
 
@@ skipping 11 matching lines @@
 
   static ui::LocatedEvent* ConvertEvent(aura::Window* target,
                                            const ui::MouseEvent& event) {
     scoped_ptr<DragDropTracker> tracker(
         new DragDropTracker(Shell::GetPrimaryRootWindow(), NULL));
     ui::LocatedEvent* converted = tracker->ConvertEvent(target, event);
     return converted;
   }
 };
 
-// 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())

[dnicoara, 2014/09/18 16:48:06]

This is needed since Windows doesn't support multiple displays.

+    return;
 
-TEST_F(DragDropTrackerTest, MAYBE_GetTarget) {
+  UpdateDisplay("200x200,300x300");
   aura::Window::Windows root_windows = Shell::GetAllRootWindows();
   EXPECT_EQ(2U, root_windows.size());
 
   scoped_ptr<aura::Window> window0(
       CreateTestWindow(gfx::Rect(0, 0, 100, 100)));
   window0->Show();
 
   scoped_ptr<aura::Window> window1(
       CreateTestWindow(gfx::Rect(300, 100, 100, 100)));
   window1->Show();
@@ skipping 38 matching lines @@
   // Start tracking from the RootWindow1 and check the point on RootWindow1 that
   // |window1| covers.
   EXPECT_EQ(window1.get(), GetTarget(gfx::Point(150, 150)));
 
   // Start tracking from the RootWindow1 and check the point on RootWindow1 that
   // neither |window0| nor |window1| covers.
   EXPECT_NE(window0.get(), GetTarget(gfx::Point(50, 50)));
   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());
 
   scoped_ptr<aura::Window> window0(
       CreateTestWindow(gfx::Rect(0, 0, 100, 100)));
   window0->Show();
 
   scoped_ptr<aura::Window> window1(
       CreateTestWindow(gfx::Rect(300, 100, 100, 100)));
   window1->Show();
@@ skipping 56 matching lines @@
   scoped_ptr<ui::LocatedEvent> converted11(ConvertEvent(window1.get(),
                                                            original11));
   EXPECT_EQ(original11.type(), converted11->type());
   EXPECT_EQ("50,50", converted11->location().ToString());
   EXPECT_EQ("150,150", converted11->root_location().ToString());
   EXPECT_EQ(original11.flags(), converted11->flags());
 }
 
 }  // namespace test
 }  // namespace aura