GPU Tracer no longer issue device traces when device category is off.

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>
@@ skipping 138 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(TraceOutputter);
 };
 
 class GPU_EXPORT GPUTrace
     : public base::RefCounted<GPUTrace> {
  public:
   GPUTrace(scoped_refptr<Outputter> outputter,
            gfx::GPUTimingClient* gpu_timing_client,
            const std::string& category,
            const std::string& name,
-           const bool enabled);
+           const bool tracing_service,
+           const bool tracing_device);
 
   void Destroy(bool have_context);
 
-  void Start(bool trace_service);
-  void End(bool tracing_service);
+  void Start();
+  void End();
   bool IsAvailable();
-  bool IsEnabled() { return enabled_; }
+  bool IsServiceTraceEnabled() const { return service_enabled_; }
+  bool IsDeviceTraceEnabled() const { return device_enabled_; }
   void Process();
 
  private:
   ~GPUTrace();
 
   void Output();
 
   friend class base::RefCounted<GPUTrace>;
 
   std::string category_;
   std::string name_;
   scoped_refptr<Outputter> outputter_;
   scoped_ptr<gfx::GPUTimer> gpu_timer_;
-  const bool enabled_ = false;
+  const bool service_enabled_ = false;
+  const bool device_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_