diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 00:37:49 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-10-06 00:37:49 +0000 |
| commit | c60f90ba71a118fdf90b7c62e9dcecd934282ed0 (patch) | |
| tree | 6c7f0aa4c33f203a4c4abc161fd470ceffa585bb /views | |
| parent | 4ff65f1ec4c3ba952378716ac88441cc162d8132 (diff) | |
| download | chromium_src-c60f90ba71a118fdf90b7c62e9dcecd934282ed0.zip chromium_src-c60f90ba71a118fdf90b7c62e9dcecd934282ed0.tar.gz chromium_src-c60f90ba71a118fdf90b7c62e9dcecd934282ed0.tar.bz2 | |
Gets the test Ownership_PlatformNativeWidgetOwnsWidget_NativeDestroy
to pass on aura.
BUG=none
TEST=none
R=ben@chromium.org
Review URL: http://codereview.chromium.org/8136032
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104215 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'views')
| -rw-r--r-- | views/widget/widget_unittest.cc | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/views/widget/widget_unittest.cc b/views/widget/widget_unittest.cc index 9b3fe5a9..ab16a55 100644 --- a/views/widget/widget_unittest.cc +++ b/views/widget/widget_unittest.cc @@ -13,6 +13,7 @@ #include "views/views_delegate.h" #if defined(USE_AURA) +#include "ui/aura/window.h" #include "views/widget/native_widget_aura.h" #elif defined(OS_WIN) #include "views/widget/native_widget_win.h" @@ -585,18 +586,10 @@ 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, - MAYBE_Ownership_PlatformNativeWidgetOwnsWidget_NativeDestroy) { + Ownership_PlatformNativeWidgetOwnsWidget_NativeDestroy) { OwnershipTestState state; Widget* widget = new OwnershipTestWidget(&state); @@ -606,7 +599,7 @@ TEST_F(WidgetOwnershipTest, // Now simulate a destroy of the platform native widget from the OS: #if defined(USE_AURA) - NOTIMPLEMENTED(); + delete widget->GetNativeView(); #elif defined(OS_WIN) DestroyWindow(widget->GetNativeView()); #elif defined(TOOLKIT_USES_GTK) |