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

gpu/command_buffer/service/gpu_tracer.h

Index: gpu/command_buffer/service/gpu_tracer.h
diff --git a/gpu/command_buffer/service/gpu_tracer.h b/gpu/command_buffer/service/gpu_tracer.h
index 3f8ec84812f496717f94c563f64ffeb6ef3dc4eb..1bd19730223467756aa952c629817418bebbc03b 100644
--- a/gpu/command_buffer/service/gpu_tracer.h
+++ b/gpu/command_buffer/service/gpu_tracer.h
@@ -156,14 +156,16 @@ class GPU_EXPORT GPUTrace
            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:
@@ -177,7 +179,8 @@ class GPU_EXPORT GPUTrace
   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);
 };