Makes ChildModalWindow not leak

ash/test/child_modal_window.cc

 // Copyright 2014 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 "ash/test/child_modal_window.h"
 
+#include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
 #include "ui/views/controls/button/label_button.h"
 #include "ui/views/controls/native/native_view_host.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/widget/widget_delegate.h"
 #include "ui/wm/core/window_modality_controller.h"
@@ skipping 23 matching lines @@
 const int kChildTextfieldLeft = 20;
 const int kChildTextfieldTop = 50;
 const int kChildTextfieldWidth = 290;
 const int kChildTextfieldHeight = 35;
 
 const SkColor kModalParentColor = SK_ColorWHITE;
 const SkColor kChildColor = SK_ColorWHITE;
 
 }  // namespace
 
-void CreateChildModalParent(gfx::NativeView context) {
+void CreateChildModalParent(aura::Window* context) {
   Widget::CreateWindowWithContextAndBounds(
       new ChildModalParent(context), context,
       gfx::Rect(kWindowLeft, kWindowTop, kWindowWidth, kWindowHeight))
       ->Show();
 }
 
 class ChildModalWindow : public views::WidgetDelegateView {
  public:
   ChildModalWindow();
   ~ChildModalWindow() override;
@@ skipping 33 matching lines @@
 }
 
 bool ChildModalWindow::CanResize() const {
   return false;
 }
 
 ui::ModalType ChildModalWindow::GetModalType() const {
   return ui::MODAL_TYPE_CHILD;
 }
 
-ChildModalParent::ChildModalParent(gfx::NativeView context)
-    : button_(new views::LabelButton(
+ChildModalParent::ChildModalParent(aura::Window* context)
+    : widget_(base::MakeUnique<Widget>()),
+      button_(new views::LabelButton(
           this,
           base::ASCIIToUTF16("Show/Hide Child Modal Window"))),
       textfield_(new views::Textfield),
       host_(new views::NativeViewHost),
-      modal_parent_(NULL),
-      child_(NULL) {
-  Widget* widget = new Widget;
+      child_(nullptr) {
   Widget::InitParams params(Widget::InitParams::TYPE_CONTROL);
+  params.ownership = Widget::InitParams::WIDGET_OWNS_NATIVE_WIDGET;
   params.context = context;
-  widget->Init(params);
-  widget->GetRootView()->set_background(
+  widget_->Init(params);
+  widget_->GetRootView()->set_background(
       views::Background::CreateSolidBackground(kModalParentColor));
-  modal_parent_ = widget->GetNativeView();
-  widget->GetNativeView()->SetName("ModalParent");
+  widget_->GetNativeView()->SetName("ModalParent");
   AddChildView(button_);
   AddChildView(textfield_);
   AddChildView(host_);
 }
 
 ChildModalParent::~ChildModalParent() {}
 
 void ChildModalParent::ShowChild() {
   if (!child_)
     child_ = CreateChild();
   child_->Show();
 }
 
-gfx::NativeWindow ChildModalParent::GetModalParent() const {
-  return modal_parent_;
+aura::Window* ChildModalParent::GetModalParent() const {
+  return widget_->GetNativeView();
 }
 
-gfx::NativeWindow ChildModalParent::GetChild() const {
+aura::Window* ChildModalParent::GetChild() const {
   if (child_)
     return child_->GetNativeView();
-  return NULL;
+  return nullptr;
 }
 
 Widget* ChildModalParent::CreateChild() {
   Widget* child = Widget::CreateWindowWithParent(new ChildModalWindow,
                                                  GetWidget()->GetNativeView());
   wm::SetModalParent(child->GetNativeView(), GetModalParent());
   child->AddObserver(this);
   child->GetNativeView()->SetName("ChildModalWindow");
   return child;
 }
@@ skipping 21 matching lines @@
   button_->SetBounds(x(), running_y, width(), kButtonHeight);
   running_y += kButtonHeight;
   textfield_->SetBounds(x(), running_y, width(), kTextfieldHeight);
   running_y += kTextfieldHeight;
   host_->SetBounds(x(), running_y, width(), height() - running_y);
 }
 
 void ChildModalParent::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add && details.child == this) {
-    host_->Attach(modal_parent_);
+    host_->Attach(widget_->GetNativeWindow());
     GetWidget()->GetNativeView()->SetName("Parent");
   }
 }
 
 void ChildModalParent::ButtonPressed(views::Button* sender,
                                      const ui::Event& event) {
   if (sender == button_) {
     if (!child_)
       child_ = CreateChild();
     if (child_->IsVisible())
       child_->Hide();
     else
       child_->Show();
   }
 }
 
 void ChildModalParent::OnWidgetDestroying(Widget* widget) {
   if (child_) {
     DCHECK_EQ(child_, widget);
     child_ = NULL;
   }
 }
 
 }  // namespace test
 }  // namespace ash