Fix delivery of percent full notifications from TracingController. This was broken by revision 2428…

content/browser/tracing/tracing_controller_impl.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/browser/tracing/tracing_controller_impl.h"
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
 #include "base/file_util.h"
 #include "base/json/string_escape.h"
@@ skipping 746 matching lines @@
         maximum_trace_buffer_percent_full_);
     pending_trace_buffer_percent_full_callback_.Reset();
   }
 
   if (pending_trace_buffer_percent_full_ack_count_ == 1) {
     // The last ack represents local trace, so we need to ack it now. Note that
     // this code only executes if there were child processes.
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         base::Bind(&TracingControllerImpl::OnTraceBufferPercentFullReply,
                    base::Unretained(this),
-                   make_scoped_refptr(trace_message_filter),
+                   scoped_refptr<TraceMessageFilter>(),
                    TraceLog::GetInstance()->GetBufferPercentFull()));

[Xianzhu, 2014/01/08 20:58:16]

It seems that we could call TraceLog::GetInstance->GetBufferPercentFull() in
TracingControllerImpl::GetTraceBufferPercentFull() unconditionally, to avoid the
above code.

[Marshall, 2014/01/09 17:09:09]

Done.

   }
 }
 
 void TracingControllerImpl::OnWatchEventMatched() {
   if (!BrowserThread::CurrentlyOn(BrowserThread::UI)) {
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         base::Bind(&TracingControllerImpl::OnWatchEventMatched,
                    base::Unretained(this)));
     return;
   }
 
   if (!watch_event_callback_.is_null())
     watch_event_callback_.Run();
 }
 
 }  // namespace content