Add cpu count to trace metadata

base/test/trace_event_analyzer.cc

Index: base/test/trace_event_analyzer.cc
diff --git a/base/test/trace_event_analyzer.cc b/base/test/trace_event_analyzer.cc
index f47f1c62b65becf8e08f5224b022d295477b5eef..3de58e7a61be58f89b063436267e2f27629bf835 100644
--- a/base/test/trace_event_analyzer.cc
+++ b/base/test/trace_event_analyzer.cc
@@ -634,8 +634,11 @@ namespace {
 // Search |events| for |query| and add matches to |output|.
 size_t FindMatchingEvents(const std::vector<TraceEvent>& events,
                           const Query& query,
-                          TraceEventVector* output) {
+                          TraceEventVector* output,
+                          bool ignore_metadata_events) {
   for (size_t i = 0; i < events.size(); ++i) {
+    if (ignore_metadata_events && events[i].phase == TRACE_EVENT_PHASE_METADATA)
+      continue;
     if (query.Evaluate(events[i]))
       output->push_back(&events[i]);
   }
@@ -669,8 +672,9 @@ bool ParseEventsFromJson(const std::string& json,
 
 // TraceAnalyzer
 
-TraceAnalyzer::TraceAnalyzer() : allow_assocation_changes_(true) {
-}
+TraceAnalyzer::TraceAnalyzer()
+    : ignore_metadata_events_(false),
+      allow_assocation_changes_(true) {}
 
 TraceAnalyzer::~TraceAnalyzer() {
 }
@@ -788,7 +792,8 @@ void TraceAnalyzer::MergeAssociatedEventArgs() {
 size_t TraceAnalyzer::FindEvents(const Query& query, TraceEventVector* output) {
   allow_assocation_changes_ = false;
   output->clear();
-  return FindMatchingEvents(raw_events_, query, output);
+  return FindMatchingEvents(
+      raw_events_, query, output, ignore_metadata_events_);
 }
 
 const TraceEvent* TraceAnalyzer::FindFirstOf(const Query& query) {