* Widget with WIDGET_OWNS_NATIVE_WIDGET has to be deleted explicitly.

* Delegate needs to be deleted but window has to be deleted prior to it.
* a few minor leak fixes.

BUG=none
TEST=none

Review URL: https://chromiumcodereview.appspot.com/9350013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@120856 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 6 deletions

diff --git a/ash/drag_drop/drag_drop_controller_unittest.cc b/ash/drag_drop/drag_drop_controller_unittest.cc
index 62c6ccb..659e992 100644
--- a/ash/drag_drop/drag_drop_controller_unittest.cc
+++ b/ash/drag_drop/drag_drop_controller_unittest.cc
@@ -355,8 +355,8 @@ TEST_F(DragDropControllerTest, DragDropInMultipleViewsMultipleWidgetsTest) {
 
 TEST_F(DragDropControllerTest, ViewRemovedWhileInDragDropTest) {
   scoped_ptr<views::Widget> widget(CreateNewWidget());
-  DragTestView* drag_view = new DragTestView;
-  AddViewToWidgetAndResize(widget.get(), drag_view);
+  scoped_ptr<DragTestView> drag_view(new DragTestView);
+  AddViewToWidgetAndResize(widget.get(), drag_view.get());
   gfx::Point point = gfx::Rect(drag_view->bounds()).CenterPoint();
   ui::OSExchangeData data;
   data.SetString(UTF8ToUTF16("I am being dragged"));
@@ -376,7 +376,7 @@ TEST_F(DragDropControllerTest, ViewRemovedWhileInDragDropTest) {
     generator.MoveMouseBy(0, 1);
   }
 
-  drag_view->parent()->RemoveChildView(drag_view);
+  drag_view->parent()->RemoveChildView(drag_view.get());
   // View has been removed. We will not get any of the following drag updates.
   int num_drags_2 = 23;
   for (int i = 0; i < num_drags_2; ++i) {
@@ -433,9 +433,9 @@ TEST_F(DragDropControllerTest, DragCopiesDataToClipboardTest) {
 }
 
 TEST_F(DragDropControllerTest, WindowDestroyedDuringDragDrop) {
-  views::Widget* widget = CreateNewWidget();
+  scoped_ptr<views::Widget> widget(CreateNewWidget());
   DragTestView* drag_view = new DragTestView;
-  AddViewToWidgetAndResize(widget, drag_view);
+  AddViewToWidgetAndResize(widget.get(), drag_view);
   aura::Window* window = widget->GetNativeView();
 
   ui::OSExchangeData data;
@@ -456,7 +456,7 @@ TEST_F(DragDropControllerTest, WindowDestroyedDuringDragDrop) {
       EXPECT_EQ(window, GetDraggedWindow());
   }
 
-  delete window;
+  widget->CloseNow();
   EXPECT_FALSE(GetDraggedWindow());
 
   num_drags = 23;