Fix memory leak in TraceSubscriberStdioImpl.

This class uses TraceBuffer internally, via a callback object.
The callback references the TraceSubscriberStdioImpl so there
was a reference cycle. Fixed by explicitly clearing the callback.

BUG=115411
TEST=TraceSubscriberStdioTest under Valgrind


Review URL: https://chromiumcodereview.appspot.com/10797012

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@147482 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 6 insertions, 3 deletions

diff --git a/content/browser/trace_subscriber_stdio.cc b/content/browser/trace_subscriber_stdio.cc
index e390212..a102810 100644
--- a/content/browser/trace_subscriber_stdio.cc
+++ b/content/browser/trace_subscriber_stdio.cc
@@ -58,6 +58,9 @@ class TraceSubscriberStdioImpl
       fclose(file_);
       file_ = 0;
     }
+    // This is important, as it breaks a reference cycle.
+    trace_buffer_.SetOutputCallback(
+        base::debug::TraceResultBuffer::OutputCallback());
   }
 
   void Write(const std::string& output_str) {
@@ -79,7 +82,7 @@ TraceSubscriberStdio::TraceSubscriberStdio(const FilePath& path)
     : impl_(new TraceSubscriberStdioImpl(path)) {
   BrowserThread::PostBlockingPoolSequencedTask(
       __FILE__, FROM_HERE,
-      base::Bind(&TraceSubscriberStdioImpl::OnStart, impl_.get()));
+      base::Bind(&TraceSubscriberStdioImpl::OnStart, impl_));
 }
 
 TraceSubscriberStdio::~TraceSubscriberStdio() {
@@ -88,14 +91,14 @@ TraceSubscriberStdio::~TraceSubscriberStdio() {
 void TraceSubscriberStdio::OnEndTracingComplete() {
   BrowserThread::PostBlockingPoolSequencedTask(
       __FILE__, FROM_HERE,
-      base::Bind(&TraceSubscriberStdioImpl::OnEnd, impl_.get()));
+      base::Bind(&TraceSubscriberStdioImpl::OnEnd, impl_));
 }
 
 void TraceSubscriberStdio::OnTraceDataCollected(
     const scoped_refptr<base::RefCountedString>& data_ptr) {
   BrowserThread::PostBlockingPoolSequencedTask(
       __FILE__, FROM_HERE,
-      base::Bind(&TraceSubscriberStdioImpl::OnData, impl_.get(), data_ptr));
+      base::Bind(&TraceSubscriberStdioImpl::OnData, impl_, data_ptr));
 }
 
 }  // namespace content