Views views_unittests native widget tests leak

views/widget/native_widget_unittest.cc

Index: views/widget/native_widget_unittest.cc
diff --git a/views/widget/native_widget_unittest.cc b/views/widget/native_widget_unittest.cc
index 158f7c6abfd97883192f309a78df5ed20f945ab3..17fc5641b0f19560051b80f74da5d84f670c0637 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|
+    // delegate.

[Ben Goodger (Google), 2011/06/29 16:12:48]

remove " delegate"

[dhollowa, 2011/06/29 16:17:43]

Done.

     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(),