Views views_unittests native widget tests leak

views/widget/native_widget_test_utils_win.cc

Index: views/widget/native_widget_test_utils_win.cc
diff --git a/views/widget/native_widget_test_utils_win.cc b/views/widget/native_widget_test_utils_win.cc
index b6a4184e907c4a22b401b812abff61f7031f20d9..7e8926a9338d481af7ebc977d142aa8dff64888c 100644
--- a/views/widget/native_widget_test_utils_win.cc
+++ b/views/widget/native_widget_test_utils_win.cc
@@ -11,28 +11,26 @@
 namespace views {
 namespace internal {
 
-NativeWidgetPrivate* CreateNativeWidget() {
-  return CreateNativeWidgetWithContents(new View);
-}
+namespace {
 
-NativeWidgetPrivate* CreateNativeWidgetWithContents(View* contents_view) {
+NativeWidgetPrivate* CreateNativeWidgetOfType(Widget::InitParams::Type type) {
   Widget* widget = new Widget;
-  Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
+  Widget::InitParams params(type);
+  params.ownership = views::Widget::InitParams::NATIVE_WIDGET_OWNS_WIDGET;
+  params.child = false; // Implicitly set to true by ctor with TYPE_CONTROL.
   params.bounds = gfx::Rect(10, 10, 200, 200);
   widget->Init(params);
   return widget->native_widget_private();
 }
 
-NativeWidgetPrivate* CreateNativeWidgetWithParent(NativeWidgetPrivate* parent) {
-  Widget* widget = new Widget;
-  Widget::InitParams params(Widget::InitParams::TYPE_CONTROL);
-  params.ownership = views::Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
-  params.child = false; // Implicitly set to true by ctor with TYPE_CONTROL.
-  params.parent = parent ? parent->GetWidget()->GetNativeView() : NULL;
-  params.bounds = gfx::Rect(10, 10, 200, 200);
-  widget->Init(params);
-  return widget->native_widget_private();
+}  // namespace
+
+NativeWidgetPrivate* CreateNativeWidget() {
+  return CreateNativeWidgetOfType(Widget::InitParams::TYPE_POPUP);
+}
+
+NativeWidgetPrivate* CreateNativeSubWidget() {
+  return CreateNativeWidgetOfType(Widget::InitParams::TYPE_CONTROL);
 }
 
 }  // namespace internal