Update from https://crrev.com/312398

gpu/command_buffer/service/gpu_tracer.h

 // 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.
 
 // This file contains the GPUTrace class.
 #ifndef GPU_COMMAND_BUFFER_SERVICE_GPU_TRACER_H_
 #define GPU_COMMAND_BUFFER_SERVICE_GPU_TRACER_H_
 
 #include <string>
 
@@ skipping 116 matching lines @@
 };
 
 class Outputter : public base::RefCounted<Outputter> {
  public:
   virtual void TraceDevice(const std::string& category,
                            const std::string& name,
                            int64 start_time,
                            int64 end_time) = 0;
 
   virtual void TraceServiceBegin(const std::string& category,
-                                 const std::string& name,
-                                 void* id) = 0;
+                                 const std::string& name) = 0;
 
   virtual void TraceServiceEnd(const std::string& category,
-                               const std::string& name,
-                               void* id) = 0;
+                               const std::string& name) = 0;
 
  protected:
   virtual ~Outputter() {}
   friend class base::RefCounted<Outputter>;
 };
 
 class TraceOutputter : public Outputter {
  public:
   static scoped_refptr<TraceOutputter> Create(const std::string& name);
   void TraceDevice(const std::string& category,
                    const std::string& name,
                    int64 start_time,
                    int64 end_time) override;
 
   void TraceServiceBegin(const std::string& category,
-                         const std::string& name,
-                         void* id) override;
+                         const std::string& name) override;
 
   void TraceServiceEnd(const std::string& category,
-                       const std::string& name,
-                       void* id) override;
+                       const std::string& name) override;
 
  protected:
   friend class base::RefCounted<Outputter>;
   explicit TraceOutputter(const std::string& name);
   ~TraceOutputter() override;
 
   base::Thread named_thread_;
   uint64 local_trace_id_;
 
   DISALLOW_COPY_AND_ASSIGN(TraceOutputter);
@@ skipping 32 matching lines @@
   int64 start_time_;
   int64 end_time_;
   GpuTracerType tracer_type_;
   bool end_requested_;
 
   GLuint queries_[2];
 
   DISALLOW_COPY_AND_ASSIGN(GPUTrace);
 };
 
+class ScopedGPUTrace {
+  public:
+    ScopedGPUTrace(GPUTracer* gpu_tracer, GpuTracerSource source,
+                   const std::string& category, const std::string& name)
+        : gpu_tracer_(gpu_tracer),
+          source_(source) {
+      gpu_tracer_->Begin(category, name, source_);
+    }
+
+    ~ScopedGPUTrace() {
+      gpu_tracer_->End(source_);
+    }
+
+   private:
+    GPUTracer* gpu_tracer_;
+    GpuTracerSource source_;
+};
+
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GPU_TRACER_H_