summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorasargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-07 22:20:58 +0000
committerasargent@chromium.org <asargent@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-02-07 22:20:58 +0000
commit7716ea2639111e9e3068de5c64e6712614b8081e (patch)
tree6fa8f98a1d1a9a3846a71e77e760add364fc2f51
parentc76dd0f28d2efe5bab93abd6a87e4e598716ef05 (diff)
downloadchromium_src-7716ea2639111e9e3068de5c64e6712614b8081e.zip
chromium_src-7716ea2639111e9e3068de5c64e6712614b8081e.tar.gz
chromium_src-7716ea2639111e9e3068de5c64e6712614b8081e.tar.bz2
Fix unit test leak introduced by fix for crbug.com/70887
It turns out that for this test, we don't actually need a request context getter spun up, so this skips doing that and avoids the need to properly run the IO thread's message loop to let it get cleaned up at shutdown. BUG=71909 TEST=The leak should no longer show up on memory bots Review URL: http://codereview.chromium.org/6286152 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@74031 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--chrome/browser/extensions/extension_updater_unittest.cc8
-rw-r--r--tools/valgrind/memcheck/suppressions.txt9
2 files changed, 2 insertions, 15 deletions
diff --git a/chrome/browser/extensions/extension_updater_unittest.cc b/chrome/browser/extensions/extension_updater_unittest.cc
index ebe36a5..0fb7119 100644
--- a/chrome/browser/extensions/extension_updater_unittest.cc
+++ b/chrome/browser/extensions/extension_updater_unittest.cc
@@ -47,12 +47,8 @@ int expected_load_flags =
// Base class for further specialized test classes.
class MockService : public ExtensionUpdateService {
public:
- MockService() {
- profile_.CreateRequestContext();
- }
- virtual ~MockService() {
- profile_.ResetRequestContext();
- }
+ MockService() {}
+ virtual ~MockService() {}
virtual const ExtensionList* extensions() const {
ADD_FAILURE();
diff --git a/tools/valgrind/memcheck/suppressions.txt b/tools/valgrind/memcheck/suppressions.txt
index a0ac120..6e35331 100644
--- a/tools/valgrind/memcheck/suppressions.txt
+++ b/tools/valgrind/memcheck/suppressions.txt
@@ -3759,15 +3759,6 @@
fun:*DownloadFileTest5SetUpEv
}
{
- bug_71909
- Memcheck:Leak
- fun:_Znw*
- fun:_ZN14TestingProfile20CreateRequestContextEv
- fun:_ZN11MockService*
- ...
- fun:*ExtensionUpdaterTest*
-}
-{
bug_72170a
Memcheck:Addr4
fun:pthread_mutex_lock