Add an explicit way of making IDs local or global

base/test/trace_event_analyzer.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 "base/test/trace_event_analyzer.h"
 
 #include <math.h>
 
 #include <algorithm>
 #include <memory>
@@ skipping 73 matching lines @@
     return false;
   }
   if (!dictionary->GetString("name", &name)) {
     LOG(ERROR) << "name is missing from TraceEvent JSON";
     return false;
   }
   if (!dictionary->GetDictionary("args", &args)) {
     LOG(ERROR) << "args is missing from TraceEvent JSON";
     return false;
   }
-  if (require_id && !dictionary->GetString("id", &id)) {
+  if (require_id && !dictionary->GetString("id", &id) &&
+      !dictionary->GetString("local_id", &local_id) &&
+      !dictionary->GetString("global_id", &global_id)) {
     LOG(ERROR) << "id is missing from ASYNC_BEGIN/ASYNC_END TraceEvent JSON";
     return false;
   }
 
   // For each argument, copy the type and create a trace_analyzer::TraceValue.
   for (base::DictionaryValue::Iterator it(*args); !it.IsAtEnd();
        it.Advance()) {
     std::string str;
     bool boolean = false;
     int int_num = 0;
@@ skipping 885 matching lines @@
   end_position = (end_position < events.size()) ? end_position : events.size();
   size_t count = 0u;
   for (size_t i = begin_position; i < end_position; ++i) {
     if (query.Evaluate(*events.at(i)))
       ++count;
   }
   return count;
 }
 
 }  // namespace trace_analyzer