diff options
Diffstat (limited to 'net')
| -rw-r--r-- | net/net.gyp | 10 | ||||
| -rw-r--r-- | net/socket/ssl_test_util.cc | 2 |
2 files changed, 12 insertions, 0 deletions
diff --git a/net/net.gyp b/net/net.gyp index c5743d8..7e22af8 100644 --- a/net/net.gyp +++ b/net/net.gyp @@ -604,6 +604,7 @@ 'base/host_cache_unittest.cc', 'base/host_resolver_impl_unittest.cc', 'base/keygen_handler_unittest.cc', + 'base/leak_annotations.h', 'base/listen_socket_unittest.cc', 'base/listen_socket_unittest.h', 'base/mapped_host_resolver_unittest.cc', @@ -825,6 +826,15 @@ '../build/linux/system.gyp:nss', ], }], + ['OS == "linux"', { + 'conditions': [ + ['linux_use_tcmalloc==1', { + 'dependencies': [ + '../base/allocator/allocator.gyp:allocator', + ], + }], + ], + }], ], }, { diff --git a/net/socket/ssl_test_util.cc b/net/socket/ssl_test_util.cc index c3fe625ea..b52dba5 100644 --- a/net/socket/ssl_test_util.cc +++ b/net/socket/ssl_test_util.cc @@ -18,6 +18,7 @@ #endif #include "base/file_util.h" +#include "base/leak_annotations.h" #include "base/logging.h" #include "base/path_service.h" #include "base/utf_string_conversions.h" @@ -301,6 +302,7 @@ bool TestServerLauncher::LoadTestRootCert() { // This currently leaks a little memory. // TODO(dkegel): fix the leak and remove the entry in // tools/valgrind/memcheck/suppressions.txt + ANNOTATE_SCOPED_MEMORY_LEAK; // Tell heap checker about the leak. cert_ = LoadTemporaryRootCert(GetRootCertPath()); DCHECK(cert_); return (cert_ != NULL); |