Update from https://crrev.com/312398

gpu/command_buffer/service/gpu_tracer.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 "gpu/command_buffer/service/gpu_tracer.h"
 
 #include <deque>
 
 #include "base/bind.h"
 #include "base/debug/trace_event.h"
@@ skipping 58 matching lines @@
       name.c_str(),
       local_trace_id_,
       named_thread_.thread_id(),
       end_time,
       "gl_category",
       category.c_str());
   ++local_trace_id_;
 }
 
 void TraceOutputter::TraceServiceBegin(const std::string& category,
-                                       const std::string& name,
-                                       void* id) {
-  TRACE_EVENT_COPY_ASYNC_BEGIN1(TRACE_DISABLED_BY_DEFAULT("gpu.service"),
-                                  name.c_str(), this,
-                                  "gl_category", category.c_str());
+                                       const std::string& name) {
+  TRACE_EVENT_COPY_BEGIN1(TRACE_DISABLED_BY_DEFAULT("gpu.service"),
+                          name.c_str(), "gl_category", category.c_str());
 }
 
 void TraceOutputter::TraceServiceEnd(const std::string& category,
-                                     const std::string& name,
-                                     void* id) {
-  TRACE_EVENT_COPY_ASYNC_END1(TRACE_DISABLED_BY_DEFAULT("gpu.service"),
-                                name.c_str(), this,
-                                "gl_category", category.c_str());
+                                     const std::string& name) {
+  TRACE_EVENT_COPY_END1(TRACE_DISABLED_BY_DEFAULT("gpu.service"),
+                        name.c_str(), "gl_category", category.c_str());
 }
 
 GPUTrace::GPUTrace(scoped_refptr<Outputter> outputter,
                    scoped_refptr<CPUTime> cpu_time,
                    const std::string& category,
                    const std::string& name,
                    int64 offset,
                    GpuTracerType tracer_type)
     : category_(category),
       name_(name),
@@ skipping 23 matching lines @@
 
     case kTracerTypeARBTimer:
     case kTracerTypeDisjointTimer:
       glDeleteQueriesARB(2, queries_);
       break;
   }
 }
 
 void GPUTrace::Start(bool trace_service) {
   if (trace_service) {
-    outputter_->TraceServiceBegin(category_, name_, this);
+    outputter_->TraceServiceBegin(category_, name_);
   }
 
   switch (tracer_type_) {
     case kTracerTypeInvalid:
       break;
 
     case kTracerTypeDisjointTimer:
       // For the disjoint timer, GPU idle time does not seem to increment the
       // internal counter. We must calculate the offset before any query. The
       // good news is any device that supports disjoint timer will also support
@@ skipping 21 matching lines @@
       break;
 
     case kTracerTypeARBTimer:
     case kTracerTypeDisjointTimer:
       // GL_TIMESTAMP and GL_TIMESTAMP_EXT both have the same value.
       glQueryCounter(queries_[1], GL_TIMESTAMP);
       break;
   }
 
   if (tracing_service) {
-    outputter_->TraceServiceEnd(category_, name_, this);
+    outputter_->TraceServiceEnd(category_, name_);
   }
 }
 
 bool GPUTrace::IsAvailable() {
   if (tracer_type_ != kTracerTypeInvalid) {
     if (!end_requested_)
       return false;
 
     GLint done = 0;
     glGetQueryObjectiv(queries_[1], GL_QUERY_RESULT_AVAILABLE, &done);
@@ skipping 297 matching lines @@
 void GPUTracer::IssueProcessTask() {
   if (traces_.empty() || process_posted_)
     return;
 
   process_posted_ = true;
   PostTask();
 }
 
 }  // namespace gles2
 }  // namespace gpu