Merge Group Markers into Chromium Traces.

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 <stack>
@@ skipping 15 matching lines @@
 namespace gpu {
 namespace gles2 {
 
 class Outputter;
 class GPUTrace;
 
 // Id used to keep trace namespaces separate
 enum GpuTracerSource {
   kTraceGroupInvalid = -1,
 
-  kTraceGroupMarker = 0,
-  kTraceCHROMIUM = 1,
-  kTraceDecoder = 2,
+  kTraceCHROMIUM = 0,
+  kTraceDecoder = 1,
 
   NUM_TRACER_SOURCES
 };
 
 // Marker structure for a Trace.
 struct TraceMarker {
   TraceMarker(const std::string& category, const std::string& name);
   ~TraceMarker();
 
   std::string category_;
@@ skipping 162 matching lines @@
 
  private:
   GPUTracer* gpu_tracer_;
   GpuTracerSource source_;
 };
 
 }  // namespace gles2
 }  // namespace gpu
 
 #endif  // GPU_COMMAND_BUFFER_SERVICE_GPU_TRACER_H_