Reland 179231

ui/views/test/child_modal_window.cc

 // Copyright (c) 2012 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 "ui/views/test/child_modal_window.h"
 
 #include "base/utf_string_conversions.h"  // ASCIIToUTF16
 #include "ui/aura/window.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
@@ skipping 155 matching lines @@
 bool ChildModalParent::CanResize() const {
   return false;
 }
 
 void ChildModalParent::DeleteDelegate() {
   if (child_) {
     child_->RemoveObserver(this);
     child_->Close();
     child_ = NULL;
   }
+
+  delete this;
 }
 
 void ChildModalParent::Layout() {
   int running_y = y();
   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);
 }
@@ skipping 21 matching lines @@
 
 void ChildModalParent::OnWidgetClosing(Widget* widget) {
   if (child_) {
     DCHECK_EQ(child_, widget);
     child_ = NULL;
   }
 }
 
 }  // namespace test
 }  // namespace views