diff options
| author | jyasskin@chromium.org <jyasskin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 03:55:40 +0000 |
|---|---|---|
| committer | jyasskin@chromium.org <jyasskin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-05-29 03:55:40 +0000 |
| commit | b8afde415b1ea71b783db1b1858c1ebb451f6a5a (patch) | |
| tree | 1147af08acaa9771f7402775872a8c42b7d089c9 | |
| parent | 0fdf31a0c37d57cc73514abbdd79aca1f49e251e (diff) | |
| download | chromium_src-b8afde415b1ea71b783db1b1858c1ebb451f6a5a.zip chromium_src-b8afde415b1ea71b783db1b1858c1ebb451f6a5a.tar.gz chromium_src-b8afde415b1ea71b783db1b1858c1ebb451f6a5a.tar.bz2 | |
Run the MessageLoop longer in order to clear out extra DeleteSoon()s.
Also revert the leak suppression (r202589) so we'll know if this
didn't fix the problem.
BUG=244446
Review URL: https://chromiumcodereview.appspot.com/16133011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@202768 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | chrome/browser/extensions/test_extension_environment.cc | 4 | ||||
| -rw-r--r-- | tools/valgrind/memcheck/suppressions.txt | 9 |
2 files changed, 1 insertions, 12 deletions
diff --git a/chrome/browser/extensions/test_extension_environment.cc b/chrome/browser/extensions/test_extension_environment.cc index 5d207de..4ff5e93 100644 --- a/chrome/browser/extensions/test_extension_environment.cc +++ b/chrome/browser/extensions/test_extension_environment.cc @@ -38,9 +38,7 @@ TestExtensionEnvironment::~TestExtensionEnvironment() { profile_.reset(); // Delete the profile, and then cycle the message loop to clear // out delayed deletions. - base::RunLoop run_loop; - loop_.PostTask(FROM_HERE, run_loop.QuitClosure()); - run_loop.Run(); + base::RunLoop().RunUntilIdle(); } TestingProfile* TestExtensionEnvironment::profile() const { diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt index 3667ebe..4ed78d2 100644 --- a/tools/valgrind/memcheck/suppressions.txt +++ b/tools/valgrind/memcheck/suppressions.txt @@ -7304,12 +7304,3 @@ fun:_ZN7content21RenderViewHostManager8NavigateERKNS_19NavigationEntryImplE fun:_ZN3ash4test11AshTestBase13UpdateDisplayERKSs fun:_ZN3ash8internal44MirrorWindowControllerTest_MirrorCursor_Test8TestBodyEv } -{ - bug_244446 - Memcheck:Leak - fun:_Znw* - fun:_ZN10extensions19TestExtensionSystem22CreateExtensionServiceEPK11CommandLineRKN4base8FilePathEb - fun:_ZN10extensions24TestExtensionEnvironment19GetExtensionServiceEv - fun:_ZN10extensions24TestExtensionEnvironment13MakeExtensionERKN4base5ValueE - fun:_ZN10extensions12_GLOBAL__N_162DeclarativeContentRulesRegistryTest_ActiveRulesDoesntGrow_Test8TestBodyEv -} |