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

Unified Diff: ash/mus/window_manager_unittest.cc

Issue 2517203005: Enable mash_unittests on CrOS Ozone trybot. (Closed)
Patch Set: Created 4 years, 1 month 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/mus/app_launch_unittest.cc ('k') | testing/buildbot/chromium.chromiumos.json » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/mus/window_manager_unittest.cc
diff --git a/ash/mus/window_manager_unittest.cc b/ash/mus/window_manager_unittest.cc
index 62a86dd139ee9f3db49fb7ca8a04f9547414e7d5..bc9875320e87507c71885f6523213a35e2613929 100644
--- a/ash/mus/window_manager_unittest.cc
+++ b/ash/mus/window_manager_unittest.cc
@@ -48,12 +48,7 @@ void OnEmbed(bool success) {
// (ash::MaterialDesignController::IsShelfMaterial()). See
// crbug.com/660194 and crbug.com/642879.
// TODO(rockot): Reenable this test.
-#if defined(USE_OZONE)
-#define MAYBE_OpenWindow OpenWindow
-#else
-#define MAYBE_OpenWindow DISABLED_OpenWindow
-#endif // defined(USE_OZONE)
-TEST_F(WindowManagerTest, MAYBE_OpenWindow) {
+TEST_F(WindowManagerTest, DISABLED_OpenWindow) {
WindowTreeClientDelegate window_tree_delegate;
connector()->Connect("ash");
« no previous file with comments | « ash/mus/app_launch_unittest.cc ('k') | testing/buildbot/chromium.chromiumos.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698