Update from https://crrev.com/318214

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 <deque>
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/thread.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder.h"
-#include "gpu/command_buffer/service/gpu_timing.h"
 #include "gpu/gpu_export.h"
 
+namespace gfx {
+  class GPUTimingClient;
+  class GPUTimer;
+}
+
 namespace gpu {
 namespace gles2 {
 
 class Outputter;
 class GPUTrace;
 
 // Id used to keep trace namespaces separate
 enum GpuTracerSource {
   kTraceGroupInvalid = -1,
 
@@ skipping 44 matching lines @@
  protected:
   // Trace Processing.
   virtual scoped_refptr<Outputter> CreateOutputter(const std::string& name);
   virtual void PostTask();
 
   void Process();
   void ProcessTraces();
 
   void IssueProcessTask();
 
+  scoped_refptr<gfx::GPUTimingClient> gpu_timing_client_;
   scoped_refptr<Outputter> outputter_;
   std::vector<TraceMarker> markers_[NUM_TRACER_SOURCES];
   std::deque<scoped_refptr<GPUTrace> > traces_;
 
   const unsigned char* gpu_trace_srv_category;
   const unsigned char* gpu_trace_dev_category;
   gles2::GLES2Decoder* decoder_;
-  gpu::GPUTiming gpu_timing_;
 
   bool gpu_executing_;
   bool process_posted_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(GPUTracer);
 };
 
 class Outputter : public base::RefCounted<Outputter> {
  public:
@@ skipping 36 matching lines @@
   uint64 local_trace_id_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TraceOutputter);
 };
 
 class GPU_EXPORT GPUTrace
     : public base::RefCounted<GPUTrace> {
  public:
   GPUTrace(scoped_refptr<Outputter> outputter,
-           gpu::GPUTiming* gpu_timing,
+           gfx::GPUTimingClient* gpu_timing_client,
            const std::string& category,
            const std::string& name,
            const bool enabled);
 
   void Start(bool trace_service);
   void End(bool tracing_service);
   bool IsAvailable();
   bool IsEnabled() { return enabled_; }
   void Process();
 
  private:
   ~GPUTrace();
 
   void Output();
 
   friend class base::RefCounted<GPUTrace>;
 
   std::string category_;
   std::string name_;
   scoped_refptr<Outputter> outputter_;
-  scoped_ptr<gpu::GPUTimer> gpu_timer_;
+  scoped_ptr<gfx::GPUTimer> gpu_timer_;
   const bool enabled_ = false;
 
   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_