Allow use of the chrome trace categories string from the tracing ui internals.

content/browser/trace_controller_impl.cc

 // Copyright (c) 2012 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/trace_controller_impl.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/string_number_conversions.h"
@@ skipping 91 matching lines @@
       base::TimeDelta::FromSeconds(delay_secs));
 }
 
 bool TraceControllerImpl::GetKnownCategoriesAsync(TraceSubscriber* subscriber) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   // Known categories come back from child processes with the EndTracingAck
   // message. So to get known categories, just begin and end tracing immediately
   // afterwards. This will ping all the child processes for categories.
   is_get_categories_ = true;
-  bool success = BeginTracing(subscriber) && EndTracingAsync(subscriber);
+  bool success = BeginTracing(subscriber, "-test_*") &&

[jbates, 2012/08/09 00:44:06]

I think the category string should just be "*".

[Russ Harmon, 2012/08/09 00:45:32]

Ok. I was preserving the existing behavior since I wasn't sure. I'll change it.

+                 EndTracingAsync(subscriber);
   is_get_categories_ = success;
   return success;
 }
 
-bool TraceControllerImpl::BeginTracing(TraceSubscriber* subscriber) {
-  std::vector<std::string> include, exclude;
-  // By default, exclude all categories that begin with test_
-  exclude.push_back("test_*");
-  return BeginTracing(subscriber, include, exclude);
-}
-
 bool TraceControllerImpl::BeginTracing(
     TraceSubscriber* subscriber,
     const std::vector<std::string>& included_categories,
     const std::vector<std::string>& excluded_categories) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!can_begin_tracing(subscriber))
     return false;
 
   // Enable tracing
@@ skipping 228 matching lines @@
     // The last ack represents local trace, so we need to ack it now. Note that
     // this code only executes if there were child processes.
     float bpf = TraceLog::GetInstance()->GetBufferPercentFull();
     BrowserThread::PostTask(BrowserThread::UI, FROM_HERE,
         base::Bind(&TraceControllerImpl::OnTraceBufferPercentFullReply,
                    base::Unretained(this), bpf));
   }
 }
 
 }  // namespace content