Commit 47573dc5 authored by mazda@chromium.org's avatar mazda@chromium.org

Temporarily disable two tests in WidgetOwnershipTest on linux_chromeos build.

WidgetOwnershipTest.Ownership_ViewsNativeWidgetOwnsWidget
WidgetOwnershipTest.Ownership_ViewsNativeWidgetOwnsWidget_NativeDestroy

TBR=ben@chromium.org
BUG=104945
TEST=views_unittests passed

Review URL: http://codereview.chromium.org/8547006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110891 0039d316-1c4b-4281-b951-d872f2087c98
parent bb042bdd
...@@ -554,7 +554,12 @@ TEST_F(WidgetOwnershipTest, Ownership_PlatformNativeWidgetOwnsWidget) { ...@@ -554,7 +554,12 @@ TEST_F(WidgetOwnershipTest, Ownership_PlatformNativeWidgetOwnsWidget) {
} }
// NativeWidget owns its Widget, part 2: NativeWidget is a NativeWidget. // NativeWidget owns its Widget, part 2: NativeWidget is a NativeWidget.
#if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
// Temporarily disable the test (http://crbug.com/104945).
TEST_F(WidgetOwnershipTest, DISABLED_Ownership_ViewsNativeWidgetOwnsWidget) {
#else
TEST_F(WidgetOwnershipTest, Ownership_ViewsNativeWidgetOwnsWidget) { TEST_F(WidgetOwnershipTest, Ownership_ViewsNativeWidgetOwnsWidget) {
#endif
OwnershipTestState state; OwnershipTestState state;
Widget* toplevel = CreateTopLevelPlatformWidget(); Widget* toplevel = CreateTopLevelPlatformWidget();
...@@ -604,8 +609,14 @@ TEST_F(WidgetOwnershipTest, ...@@ -604,8 +609,14 @@ TEST_F(WidgetOwnershipTest,
// NativeWidget owns its Widget, part 4: NativeWidget is a NativeWidget, // NativeWidget owns its Widget, part 4: NativeWidget is a NativeWidget,
// destroyed by the view hierarchy that contains it. // destroyed by the view hierarchy that contains it.
#if defined(OS_CHROMEOS) && defined(TOOLKIT_USES_GTK)
// Temporarily disable the test (http://crbug.com/104945).
TEST_F(WidgetOwnershipTest,
DISABLED_Ownership_ViewsNativeWidgetOwnsWidget_NativeDestroy) {
#else
TEST_F(WidgetOwnershipTest, TEST_F(WidgetOwnershipTest,
Ownership_ViewsNativeWidgetOwnsWidget_NativeDestroy) { Ownership_ViewsNativeWidgetOwnsWidget_NativeDestroy) {
#endif
OwnershipTestState state; OwnershipTestState state;
Widget* toplevel = CreateTopLevelPlatformWidget(); Widget* toplevel = CreateTopLevelPlatformWidget();
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment