Fix leaks in aura_unittests

ui/aura/gestures/gesture_recognizer_unittest.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 "base/memory/scoped_vector.h"
 #include "base/string_number_conversions.h"
 #include "base/timer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/root_window.h"
 #include "ui/aura/test/aura_test_base.h"
@@ skipping 1797 matching lines @@
 
   ui::GestureConsumer* target;
   const int kNumWindows = 4;
 
   scoped_array<GestureEventConsumeDelegate*> delegates(
       new GestureEventConsumeDelegate*[kNumWindows]);
 
   ui::GestureConfiguration::
       set_max_separation_for_gesture_touches_in_pixels(499);
 
-  scoped_array<gfx::Rect*> window_bounds(new gfx::Rect*[kNumWindows]);
-  window_bounds[0] = new gfx::Rect(0, 0, 1, 1);
-  window_bounds[1] = new gfx::Rect(500, 0, 1, 1);
-  window_bounds[2] = new gfx::Rect(0, 500, 1, 1);
-  window_bounds[3] = new gfx::Rect(500, 500, 1, 1);
+  scoped_array<gfx::Rect> window_bounds(new gfx::Rect[kNumWindows]);
+  window_bounds[0] = gfx::Rect(0, 0, 1, 1);
+  window_bounds[1] = gfx::Rect(500, 0, 1, 1);
+  window_bounds[2] = gfx::Rect(0, 500, 1, 1);
+  window_bounds[3] = gfx::Rect(500, 500, 1, 1);
 
   scoped_array<aura::Window*> windows(new aura::Window*[kNumWindows]);
 
   // Instantiate windows with |window_bounds| and touch each window at
   // its origin.
   for (int i = 0; i < kNumWindows; ++i) {
     delegates[i] = new GestureEventConsumeDelegate();
     windows[i] = CreateTestWindowWithDelegate(
-        delegates[i], i, *window_bounds[i], NULL);
+        delegates[i], i, window_bounds[i], NULL);
     windows[i]->set_id(i);
-    ui::TouchEvent press(ui::ET_TOUCH_PRESSED, window_bounds[i]->origin(),
+    ui::TouchEvent press(ui::ET_TOUCH_PRESSED, window_bounds[i].origin(),
                              i, GetTime());
     root_window()->AsRootWindowHostDelegate()->OnHostTouchEvent(&press);
   }
 
   // Touches should now be associated with the closest touch within
   // ui::GestureConfiguration::max_separation_for_gesture_touches_in_pixels
   target = gesture_recognizer->GetTargetForLocation(gfx::Point(11, 11));
   EXPECT_EQ("0", WindowIDAsString(target));
   target = gesture_recognizer->GetTargetForLocation(gfx::Point(511, 11));
   EXPECT_EQ("1", WindowIDAsString(target));
@@ skipping 26 matching lines @@
   target = gesture_recognizer->GetTargetForLocation(gfx::Point(1000, 1000));
   EXPECT_TRUE(target == NULL);
 
   // Move a touch associated with windows[2] to 1000, 1000
   ui::TouchEvent move2(ui::ET_TOUCH_MOVED, gfx::Point(1000, 1000),
                            kNumWindows, GetTime());
   root_window()->AsRootWindowHostDelegate()->OnHostTouchEvent(&move2);
 
   target = gesture_recognizer->GetTargetForLocation(gfx::Point(1000, 1000));
   EXPECT_EQ("2", WindowIDAsString(target));
+
+  for (int i = 0; i < kNumWindows; ++i) {
+    // Delete windows before deleting delegates.
+    delete windows[i];
+    delete delegates[i];
+  }
 }
 
 // Check that touch events outside the root window are still handled
 // by the root window's gesture sequence.
 TEST_F(GestureRecognizerTest, GestureEventOutsideRootWindowTap) {
   TestGestureRecognizer* gesture_recognizer =
       new TestGestureRecognizer(root_window());
   root_window()->SetGestureRecognizerForTesting(gesture_recognizer);
 
   scoped_ptr<aura::Window> window(CreateTestWindowWithBounds(
@@ skipping 935 matching lines @@
   root_window()->AsRootWindowHostDelegate()->OnHostTouchEvent(&move2);
   EXPECT_FALSE(delegate->tap());
   EXPECT_FALSE(delegate->scroll_update());
   EXPECT_FALSE(delegate->pinch_update());
 
   delegate->Reset();
 }
 
 }  // namespace test
 }  // namespace aura