diff options
author | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-07 11:29:16 +0000 |
---|---|---|
committer | earthdok@chromium.org <earthdok@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-07 11:29:16 +0000 |
commit | dc1841b978e5ac8f8b6cf41f6859cc472f36385f (patch) | |
tree | a1101b6450a1920bbe1e7f45f627e665a3801cf9 /chrome/browser/extensions | |
parent | 60aa0254d7ba02b09c4579f7affae7fd20f349e8 (diff) | |
download | chromium_src-dc1841b978e5ac8f8b6cf41f6859cc472f36385f.zip chromium_src-dc1841b978e5ac8f8b6cf41f6859cc472f36385f.tar.gz chromium_src-dc1841b978e5ac8f8b6cf41f6859cc472f36385f.tar.bz2 |
Annotate leak of a Screen instance in system display API tests.
BUG=313707
R=hongbo.min@intel.com
TBR=hongbo.min@intel.com
TEST=browser_tests:SystemDisplayAPI*
Review URL: https://codereview.chromium.org/59693002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@233574 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/extensions')
-rw-r--r-- | chrome/browser/extensions/api/system_display/system_display_apitest.cc | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/chrome/browser/extensions/api/system_display/system_display_apitest.cc b/chrome/browser/extensions/api/system_display/system_display_apitest.cc index a12556d..57c741d 100644 --- a/chrome/browser/extensions/api/system_display/system_display_apitest.cc +++ b/chrome/browser/extensions/api/system_display/system_display_apitest.cc @@ -4,6 +4,7 @@ #include "chrome/browser/extensions/api/system_display/system_display_api.h" +#include "base/debug/leak_annotations.h" #include "base/strings/string_number_conversions.h" #include "chrome/browser/extensions/api/system_display/display_info_provider.h" #include "chrome/browser/extensions/extension_apitest.h" @@ -175,6 +176,8 @@ class SystemDisplayApiTest: public ExtensionApiTest { virtual void SetUpOnMainThread() OVERRIDE { ExtensionApiTest::SetUpOnMainThread(); + ANNOTATE_LEAKING_OBJECT_PTR( + gfx::Screen::GetScreenByType(gfx::SCREEN_TYPE_NATIVE)); gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen_.get()); DisplayInfoProvider::InitializeForTesting(provider_.get()); } |