Views views_unittests native widget tests leak

views/widget/native_widget_unittest.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "views/test/views_test_base.h"
 #include "views/view.h"
 #include "views/controls/native/native_view_host.h"
 #include "views/widget/native_widget_private.h"
 #include "views/widget/widget.h"
 #include "views/widget/native_widget_test_utils.h"
 
 namespace views {
 
 class ScopedTestWidget {
  public:
   ScopedTestWidget(internal::NativeWidgetPrivate* native_widget)
       : 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);
 };
 
 class NativeWidgetTest : public ViewsTestBase {
  public:
   NativeWidgetTest() {}
   virtual ~NativeWidgetTest() {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(NativeWidgetTest);
@@ skipping 14 matching lines @@
 // |widget| has the toplevel NativeWidget.
 TEST_F(NativeWidgetTest, GetTopLevelNativeWidget1) {
   ScopedTestWidget widget(internal::CreateNativeWidget());
   EXPECT_EQ(widget.get(),
             internal::NativeWidgetPrivate::GetTopLevelNativeWidget(
                 widget->GetWidget()->GetNativeView()));
 }
 
 // |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(),
             internal::NativeWidgetPrivate::GetTopLevelNativeWidget(
                 child_widget->GetWidget()->GetNativeView()));
 }
 
 }  // namespace views