Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1281)

Unified Diff: ash/drag_drop/drag_drop_interactive_uitest.cc

Issue 2618143002: cros: Remove some OS platform ifdefs from ash (Closed)
Patch Set: rebase Created 3 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/drag_drop/drag_drop_controller_unittest.cc ('k') | ash/magnifier/magnification_controller_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/drag_drop/drag_drop_interactive_uitest.cc
diff --git a/ash/drag_drop/drag_drop_interactive_uitest.cc b/ash/drag_drop/drag_drop_interactive_uitest.cc
index 6464edeea2d00f021240ddfe11516edad95e5210..886d186d8f7082d441875c62b21ac3efc45f5c95 100644
--- a/ash/drag_drop/drag_drop_interactive_uitest.cc
+++ b/ash/drag_drop/drag_drop_interactive_uitest.cc
@@ -113,15 +113,9 @@ void DragDropAcrossMultiDisplay_Step1() {
using DragDropTest = test::AshInteractiveUITestBase;
-#if !defined(OS_CHROMEOS)
-#define MAYBE_DragDropAcrossMultiDisplay DISABLED_DragDropAcrossMultiDisplay
-#else
-#define MAYBE_DragDropAcrossMultiDisplay DragDropAcrossMultiDisplay
-#endif
-
// Test if the mouse gets moved properly to another display
// during drag & drop operation.
-TEST_F(DragDropTest, MAYBE_DragDropAcrossMultiDisplay) {
+TEST_F(DragDropTest, DragDropAcrossMultiDisplay) {
if (!SupportsMultipleDisplays())
return;
« no previous file with comments | « ash/drag_drop/drag_drop_controller_unittest.cc ('k') | ash/magnifier/magnification_controller_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698