Views views_unittests native widget tests leak

Eliminates leaks from NativeWidgetTest.*.  Adds additional test target to valgrind wrapper script.  Refactors native_widget_test_utils_{gtk|win}.cc to avoid duplication.

BUG=87805
TEST=tools/valgrind/chrome_tests.sh views --gtest_filter=NativeWidgetTest.*

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90979 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 12 insertions, 14 deletions

diff --git a/views/widget/native_widget_test_utils_gtk.cc b/views/widget/native_widget_test_utils_gtk.cc
index dbb1529..3217f99 100644
--- a/views/widget/native_widget_test_utils_gtk.cc
+++ b/views/widget/native_widget_test_utils_gtk.cc
@@ -11,27 +11,25 @@
 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.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.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