Fix leaks in aura_unittests

ui/aura/test/test_window_delegate.h

 // 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.
 
 #ifndef UI_AURA_TEST_TEST_WINDOW_DELEGATE_H_
 #define UI_AURA_TEST_TEST_WINDOW_DELEGATE_H_
 
 #include <string>
 
 #include "base/compiler_specific.h"
 #include "third_party/skia/include/core/SkColor.h"
 #include "ui/aura/window_delegate.h"
 #include "ui/gfx/rect.h"
 
 namespace aura {
 namespace test {
 
 // WindowDelegate implementation with all methods stubbed out.
 class TestWindowDelegate : public WindowDelegate {
  public:
   TestWindowDelegate();
   virtual ~TestWindowDelegate();
 
+  // Returns a TestWindowDelegate that delete itself when
+  // the associated window is destroyed.
+  static TestWindowDelegate* CreateSelfDestroyingDelegate();
+
   void set_window_component(int window_component) {
     window_component_ = window_component;
   }
 
   // Overridden from WindowDelegate:
   virtual gfx::Size GetMinimumSize() const OVERRIDE;
   virtual void OnBoundsChanged(const gfx::Rect& old_bounds,
                                const gfx::Rect& new_bounds) OVERRIDE;
   virtual void OnFocus(Window* old_focused_window) OVERRIDE;
   virtual void OnBlur() OVERRIDE;
@@ skipping 12 matching lines @@
   virtual void OnPaint(gfx::Canvas* canvas) OVERRIDE;
   virtual void OnDeviceScaleFactorChanged(float device_scale_factor) OVERRIDE;
   virtual void OnWindowDestroying() OVERRIDE;
   virtual void OnWindowDestroyed() OVERRIDE;
   virtual void OnWindowTargetVisibilityChanged(bool visible) OVERRIDE;
   virtual bool HasHitTestMask() const OVERRIDE;
   virtual void GetHitTestMask(gfx::Path* mask) const OVERRIDE;
 
  private:
   int window_component_;
+  bool delete_on_destroyed_;
 
   DISALLOW_COPY_AND_ASSIGN(TestWindowDelegate);
 };
 
 // A simple WindowDelegate implementation for these tests. It owns itself
 // (deletes itself when the Window it is attached to is destroyed).
 class ColorTestWindowDelegate : public TestWindowDelegate {
  public:
   explicit ColorTestWindowDelegate(SkColor color);
   virtual ~ColorTestWindowDelegate();
@@ skipping 57 matching lines @@
   int key_press_count_;
   int key_release_count_;
 
   DISALLOW_COPY_AND_ASSIGN(EventCountDelegate);
 };
 
 }  // namespace test
 }  // namespace aura
 
 #endif  // UI_AURA_TEST_TEST_WINDOW_DELEGATE_H_