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, 10 insertions, 4 deletions

diff --git a/views/widget/native_widget_unittest.cc b/views/widget/native_widget_unittest.cc
index 158f7c6..9c7218d 100644
--- a/views/widget/native_widget_unittest.cc
+++ b/views/widget/native_widget_unittest.cc
@@ -18,16 +18,18 @@ class ScopedTestWidget {
       : native_widget_(native_widget) {
   }
   ~ScopedTestWidget() {
+    // |CloseNow| deletes both |native_widget_| and its associated
+    // |Widget|.
     native_widget_->GetWidget()->CloseNow();
   }
 
   internal::NativeWidgetPrivate* operator->() const  {
-    return native_widget_.get();
+    return native_widget_;
   }
-  internal::NativeWidgetPrivate* get() const { return native_widget_.get(); }
+  internal::NativeWidgetPrivate* get() const { return native_widget_; }
 
  private:
-  scoped_ptr<internal::NativeWidgetPrivate> native_widget_;
+  internal::NativeWidgetPrivate* native_widget_;
   DISALLOW_COPY_AND_ASSIGN(ScopedTestWidget);
 };
 
@@ -62,11 +64,15 @@ TEST_F(NativeWidgetTest, GetTopLevelNativeWidget1) {
 
 // |toplevel_widget| has the toplevel NativeWidget.
 TEST_F(NativeWidgetTest, GetTopLevelNativeWidget2) {
-  ScopedTestWidget child_widget(internal::CreateNativeWidgetWithParent(NULL));
   ScopedTestWidget toplevel_widget(internal::CreateNativeWidget());
 
+  // |toplevel_widget| owns |child_host|.
   NativeViewHost* child_host = new NativeViewHost;
   toplevel_widget->GetWidget()->SetContentsView(child_host);
+
+  // |child_host| owns |child_widget|.
+  internal::NativeWidgetPrivate* child_widget =
+      internal::CreateNativeSubWidget();
   child_host->Attach(child_widget->GetWidget()->GetNativeView());
 
   EXPECT_EQ(toplevel_widget.get(),