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

Unified Diff: ui/aura/root_window_unittest.cc

Issue 70233017: ozone: Disable tests that create multiple RootWindowHosts (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: add comment to disabled tests Created 7 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 | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/aura/root_window_unittest.cc
diff --git a/ui/aura/root_window_unittest.cc b/ui/aura/root_window_unittest.cc
index 4193a37479c5ad30ba9725976239ee389a92db33..eccc3e8b648e4368cb5fdc35988c99b1d0dfe9da 100644
--- a/ui/aura/root_window_unittest.cc
+++ b/ui/aura/root_window_unittest.cc
@@ -1181,8 +1181,15 @@ class ValidRootDuringDestructionWindowObserver : public aura::WindowObserver {
} // namespace
+#if defined(USE_OZONE)
+// Creating multiple RootWindowHostOzone instances is broken.
+#define MAYBE_ValidRootDuringDestruction DISABLED_ValidRootDuringDestruction
+#else
+#define MAYBE_ValidRootDuringDestruction ValidRootDuringDestruction
+#endif
+
// Verifies GetRootWindow() from ~Window returns a valid root.
-TEST_F(RootWindowTest, ValidRootDuringDestruction) {
+TEST_F(RootWindowTest, MAYBE_ValidRootDuringDestruction) {
bool got_destroying = false;
bool has_valid_root = false;
ValidRootDuringDestructionWindowObserver observer(&got_destroying,
@@ -1294,9 +1301,16 @@ class DeleteRootFromHeldMouseEventDelegate : public test::TestWindowDelegate {
} // namespace
+#if defined(USE_OZONE)
+// Creating multiple RootWindowHostOzone instances is broken.
+#define MAYBE_DeleteRootFromHeldMouseEvent DISABLED_DeleteRootFromHeldMouseEvent
+#else
+#define MAYBE_DeleteRootFromHeldMouseEvent DeleteRootFromHeldMouseEvent
+#endif
+
// Verifies if a RootWindow is deleted from dispatching a held mouse event we
// don't crash.
-TEST_F(RootWindowTest, DeleteRootFromHeldMouseEvent) {
+TEST_F(RootWindowTest, MAYBE_DeleteRootFromHeldMouseEvent) {
// Should be deleted by |delegate|.
RootWindow* r2 =
new RootWindow(RootWindow::CreateParams(gfx::Rect(0, 0, 100, 100)));
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698