summaryrefslogtreecommitdiffstats
path: root/views/widget
diff options
context:
space:
mode:
authorsky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-05 14:08:41 +0000
committersky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-10-05 14:08:41 +0000
commit39a192ed10402c6ce4d2d61299b383d72cede827 (patch)
tree930fdf544c38691a94e504a61d87fa3315e93836 /views/widget
parente4e8afef78d9eed19ddacfe2b186cb8c501dabff (diff)
downloadchromium_src-39a192ed10402c6ce4d2d61299b383d72cede827.zip
chromium_src-39a192ed10402c6ce4d2d61299b383d72cede827.tar.gz
chromium_src-39a192ed10402c6ce4d2d61299b383d72cede827.tar.bz2
Marks a number of tests as FAILS for aura. I filed bugs on the two key
areas, I plan on immediately fixing the widget one which is why I didn't file a bug. Hopefully when we get bots actually building and running tests, these changes will make them green. TBR since this is just marking tests FAILS. BUG=99129 99128 TEST=none TBR=ben@chromium.org R=ben@chromium.org Review URL: http://codereview.chromium.org/8142022 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104098 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views/widget')
-rw-r--r--views/widget/widget_unittest.cc10
1 files changed, 9 insertions, 1 deletions
diff --git a/views/widget/widget_unittest.cc b/views/widget/widget_unittest.cc
index a93a421..9b3fe5a9 100644
--- a/views/widget/widget_unittest.cc
+++ b/views/widget/widget_unittest.cc
@@ -585,10 +585,18 @@ TEST_F(WidgetOwnershipTest, Ownership_ViewsNativeWidgetOwnsWidget) {
EXPECT_TRUE(state.native_widget_deleted);
}
+#if defined(USE_AURA)
+#define MAYBE_Ownership_PlatformNativeWidgetOwnsWidget_NativeDestroy \
+ FAILS_Ownership_PlatformNativeWidgetOwnsWidget_NativeDestroy
+#else
+#define MAYBE_Ownership_PlatformNativeWidgetOwnsWidget_NativeDestroy \
+ Ownership_PlatformNativeWidgetOwnsWidget_NativeDestroy
+#endif
+
// NativeWidget owns its Widget, part 3: NativeWidget is a platform-native
// widget, destroyed out from under it by the OS.
TEST_F(WidgetOwnershipTest,
- Ownership_PlatformNativeWidgetOwnsWidget_NativeDestroy) {
+ MAYBE_Ownership_PlatformNativeWidgetOwnsWidget_NativeDestroy) {
OwnershipTestState state;
Widget* widget = new OwnershipTestWidget(&state);