Fix logic reversal bug in TraceMessageFilter

content/browser/trace_message_filter.cc

Index: content/browser/trace_message_filter.cc
diff --git a/content/browser/trace_message_filter.cc b/content/browser/trace_message_filter.cc
index b977362cd768b5163e48ec2629e7c99b6a1ac35f..edb5bca7bf85502dd5689cf5d81bb42491c62130 100644
--- a/content/browser/trace_message_filter.cc
+++ b/content/browser/trace_message_filter.cc
@@ -14,7 +14,7 @@ using content::TraceControllerImpl;
 TraceMessageFilter::TraceMessageFilter() :
     has_child_(false),
     is_awaiting_end_ack_(false),
-    is_awaiting_bpf_ack_(false) {
+    is_awaiting_buffer_percent_full_ack_(false) {
 }
 
 void TraceMessageFilter::OnFilterAdded(IPC::Channel* channel) {
@@ -27,10 +27,10 @@ void TraceMessageFilter::OnChannelClosing() {
   BrowserMessageFilter::OnChannelClosing();
 
   if (has_child_) {
-    if (is_awaiting_bpf_ack_)
+    if (is_awaiting_end_ack_)
       OnEndTracingAck(std::vector<std::string>());
 
-    if (is_awaiting_end_ack_)
+    if (is_awaiting_buffer_percent_full_ack_)
       OnTraceBufferPercentFullReply(0.0f);
 
     TraceControllerImpl::GetInstance()->RemoveFilter(this);
@@ -73,8 +73,8 @@ void TraceMessageFilter::SendEndTracing() {
 
 void TraceMessageFilter::SendGetTraceBufferPercentFull() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  DCHECK(!is_awaiting_bpf_ack_);
-  is_awaiting_bpf_ack_ = true;
+  DCHECK(!is_awaiting_buffer_percent_full_ack_);
+  is_awaiting_buffer_percent_full_ack_ = true;
   Send(new ChildProcessMsg_GetTraceBufferPercentFull);
 }
 
@@ -89,6 +89,7 @@ void TraceMessageFilter::OnEndTracingAck(
     const std::vector<std::string>& known_categories) {
   // is_awaiting_end_ack_ should always be true here, but check in case the
   // child process is compromised.
+  DCHECK(is_awaiting_end_ack_);

[sky, 2012/06/06 20:16:32]

How about an else NOTREACHED instead. Or, remove the if entirely. Say comment on
110.

[jbates, 2012/06/06 21:22:17]

Done.

   if (is_awaiting_end_ack_) {
     is_awaiting_end_ack_ = false;
     TraceControllerImpl::GetInstance()->OnEndTracingAck(known_categories);
@@ -106,8 +107,9 @@ void TraceMessageFilter::OnTraceBufferFull() {
 }
 
 void TraceMessageFilter::OnTraceBufferPercentFullReply(float percent_full) {
-  if (is_awaiting_bpf_ack_) {
-    is_awaiting_bpf_ack_ = false;
+  DCHECK(is_awaiting_buffer_percent_full_ack_);
+  if (is_awaiting_buffer_percent_full_ack_) {
+    is_awaiting_buffer_percent_full_ack_ = false;
     TraceControllerImpl::GetInstance()->OnTraceBufferPercentFullReply(
         percent_full);
   }