diff options
| -rw-r--r-- | base/leak_tracker.h | 12 | ||||
| -rw-r--r-- | net/url_request/url_request.cc | 5 |
2 files changed, 5 insertions, 12 deletions
diff --git a/base/leak_tracker.h b/base/leak_tracker.h index 9084f9a..de6ff29 100644 --- a/base/leak_tracker.h +++ b/base/leak_tracker.h @@ -5,16 +5,8 @@ #ifndef BASE_LEAK_TRACKER_H_ #define BASE_LEAK_TRACKER_H_ -// Temporarily enable LeakTracker in all builds (both -// release and debug). This will have an impact on performance, but -// is intended to help track down a leak which reproduces on dev -// channel. -// -// TODO(eroman): Restore the old code which only enabled LeakTracker -// for debug builds. -// -// http://crbug.com/21199, http://crbug.com/18372 -#ifndef ENABLE_LEAK_TRACKER +// Only enable leak tracking in debug builds. +#ifndef NDEBUG #define ENABLE_LEAK_TRACKER #endif diff --git a/net/url_request/url_request.cc b/net/url_request/url_request.cc index 9076a75..0919a7b 100644 --- a/net/url_request/url_request.cc +++ b/net/url_request/url_request.cc @@ -41,8 +41,9 @@ const size_t URLRequest::InstanceTracker::kMaxGraveyardURLSize = 1000; URLRequest::InstanceTracker::~InstanceTracker() { base::LeakTracker<URLRequest>::CheckForLeaks(); - // Check in release mode as well, since we have the info. - CHECK(0u == GetLiveRequests().size()); + // Only check in Debug mode, because this is triggered too often. + // See http://crbug.com/21199, http://crbug.com/18372 + DCHECK_EQ(0u, GetLiveRequests().size()); } // static |