diff options
author | hshi@chromium.org <hshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-27 23:42:36 +0000 |
---|---|---|
committer | hshi@chromium.org <hshi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-27 23:42:36 +0000 |
commit | 8f2e33582ae9f4752893741772c7fac4e72915b7 (patch) | |
tree | 91d13f54fd139fe625fab32107c62abbdb701160 | |
parent | 57f680e8330d89246bcbf9cd1f5d196fab41a4e7 (diff) | |
download | chromium_src-8f2e33582ae9f4752893741772c7fac4e72915b7.zip chromium_src-8f2e33582ae9f4752893741772c7fac4e72915b7.tar.gz chromium_src-8f2e33582ae9f4752893741772c7fac4e72915b7.tar.bz2 |
Fix memory leak in DesktopCaptureDeviceAshTest on Linux Chromium OS ASAN.
The aura::test::TestWindowDelegate should be held in a scoped_ptr.
TBR=hshi@chromium.org
TEST=run content_unittests locally.
BUG=
Review URL: https://codereview.chromium.org/93123002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@237645 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r-- | content/browser/renderer_host/media/desktop_capture_device_ash_unittest.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/content/browser/renderer_host/media/desktop_capture_device_ash_unittest.cc b/content/browser/renderer_host/media/desktop_capture_device_ash_unittest.cc index 78ec948..2e82475 100644 --- a/content/browser/renderer_host/media/desktop_capture_device_ash_unittest.cc +++ b/content/browser/renderer_host/media/desktop_capture_device_ash_unittest.cc @@ -64,8 +64,8 @@ class DesktopCaptureDeviceAshTest : public testing::Test { // can use gfx::NativeWindow::GetWindowAtScreenPoint() to locate the // root window associated with the primary display. gfx::Rect desktop_bounds = root_window()->bounds(); - desktop_window_.reset(new aura::Window( - new aura::test::TestWindowDelegate())); + window_delegate_.reset(new aura::test::TestWindowDelegate()); + desktop_window_.reset(new aura::Window(window_delegate_.get())); desktop_window_->Init(ui::LAYER_TEXTURED); desktop_window_->SetBounds(desktop_bounds); aura::client::ParentWindowWithContext( @@ -77,6 +77,7 @@ class DesktopCaptureDeviceAshTest : public testing::Test { helper_->RunAllPendingInMessageLoop(); root_window()->RemoveChild(desktop_window_.get()); desktop_window_.reset(); + window_delegate_.reset(); helper_->TearDown(); } @@ -87,6 +88,7 @@ class DesktopCaptureDeviceAshTest : public testing::Test { BrowserThreadImpl browser_thread_for_ui_; scoped_ptr<aura::test::AuraTestHelper> helper_; scoped_ptr<aura::Window> desktop_window_; + scoped_ptr<aura::test::TestWindowDelegate> window_delegate_; DISALLOW_COPY_AND_ASSIGN(DesktopCaptureDeviceAshTest); }; |