Make ui::Compositor use ui::Scheduler

chrome/browser/ui/views/menu_view_drag_and_drop_test.cc

Index: chrome/browser/ui/views/menu_view_drag_and_drop_test.cc
diff --git a/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc b/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc
index 3f6dfb5396faa20bcba54d316f1eefa4f214df8d..21ca8a985e5518b6c5e6d0c1be104e6c592ff0a1 100644
--- a/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc
+++ b/chrome/browser/ui/views/menu_view_drag_and_drop_test.cc
@@ -17,8 +17,9 @@ namespace {
 
 // Borrowed from chrome/browser/ui/views/bookmarks/bookmark_bar_view_test.cc,
 // since these are also disabled on Linux for drag and drop.
-// TODO(erg): Fix DND tests on linux_aura. crbug.com/163931
-#if defined(OS_LINUX) && defined(USE_AURA)
+// TODO(erg): Fix DND tests on linux_aura. http://crbug.com/163931
+// TODO(enne): Windows version has flaky timeouts.  http://crbug.com/401226
+#if defined(USE_AURA)
 #define MAYBE(x) DISABLED_##x
 #else
 #define MAYBE(x) x