Fix leaks in aura_unittests

ui/aura/test/test_window_delegate.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/aura/test/test_window_delegate.h"
 
 #include "base/stringprintf.h"
 #include "ui/aura/window.h"
 #include "ui/base/events/event.h"
 #include "ui/base/hit_test.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/path.h"
 #include "ui/gfx/skia_util.h"
 
 namespace aura {
 namespace test {
 
 ////////////////////////////////////////////////////////////////////////////////
 // TestWindowDelegate
 
-TestWindowDelegate::TestWindowDelegate() : window_component_(HTCLIENT) {
+TestWindowDelegate::TestWindowDelegate()
+    : window_component_(HTCLIENT),
+      delete_on_destroyed_(false) {
 }
 
 TestWindowDelegate::~TestWindowDelegate() {
 }
 
+// static
+TestWindowDelegate* TestWindowDelegate::CreateSelfDestroyingDelegate() {
+  TestWindowDelegate* delegate = new TestWindowDelegate;
+  delegate->delete_on_destroyed_ = true;
+  return delegate;
+}
+
 gfx::Size TestWindowDelegate::GetMinimumSize() const {
   return gfx::Size();
 }
 
 void TestWindowDelegate::OnBoundsChanged(const gfx::Rect& old_bounds,
                                          const gfx::Rect& new_bounds) {
 }
 
 void TestWindowDelegate::OnFocus(Window* old_focused_window) {
 }
@@ skipping 43 matching lines @@
 }
 
 void TestWindowDelegate::OnDeviceScaleFactorChanged(
     float device_scale_factor) {
 }
 
 void TestWindowDelegate::OnWindowDestroying() {
 }
 
 void TestWindowDelegate::OnWindowDestroyed() {
+  if (delete_on_destroyed_)
+    delete this;
 }
 
 void TestWindowDelegate::OnWindowTargetVisibilityChanged(bool visible) {
 }
 
 bool TestWindowDelegate::HasHitTestMask() const {
   return false;
 }
 
 void TestWindowDelegate::GetHitTestMask(gfx::Path* mask) const {
@@ skipping 109 matching lines @@
   std::string result = StringPrintf("%d %d",
                                     key_press_count_,
                                     key_release_count_);
   key_press_count_ = 0;
   key_release_count_ = 0;
   return result;
 }
 
 }  // namespace test
 }  // namespace aura