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 406 matching lines @@
     return false;
 
   pending_trace_buffer_percent_full_callback_ = callback;
 
   // Count myself in pending_trace_buffer_percent_full_ack_count_, acked below.
   pending_trace_buffer_percent_full_ack_count_ =
       trace_message_filters_.size() + 1;
   pending_trace_buffer_percent_full_filters_ = trace_message_filters_;
   maximum_trace_buffer_percent_full_ = 0;
 
-  // Handle special case of zero child processes.
-  if (pending_trace_buffer_percent_full_ack_count_ == 1) {
-    BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
-        base::Bind(&TracingControllerImpl::OnTraceBufferPercentFullReply,
-                   base::Unretained(this),
-                   scoped_refptr<TraceMessageFilter>(),
-                   TraceLog::GetInstance()->GetBufferPercentFull()));
-  }
+  // Call OnTraceBufferPercentFullReply unconditionally for the browser process.
+  // This will result in immediate execution of the callback if there are no
+  // child processes.
+  BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
+      base::Bind(&TracingControllerImpl::OnTraceBufferPercentFullReply,
+                  base::Unretained(this),
+                  scoped_refptr<TraceMessageFilter>(),
+                  TraceLog::GetInstance()->GetBufferPercentFull()));
 
   // Notify all child processes.
   for (TraceMessageFilterSet::iterator it = trace_message_filters_.begin();
       it != trace_message_filters_.end(); ++it) {
     it->get()->SendGetTraceBufferPercentFull();
   }
   return true;
 }
 
 bool TracingControllerImpl::SetWatchEvent(
@@ skipping 305 matching lines @@
 
   maximum_trace_buffer_percent_full_ =
       std::max(maximum_trace_buffer_percent_full_, percent_full);
 
   if (--pending_trace_buffer_percent_full_ack_count_ == 0) {
     // Trigger callback if one is set.
     pending_trace_buffer_percent_full_callback_.Run(
         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),
-                   TraceLog::GetInstance()->GetBufferPercentFull()));
-  }
 }
 
 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