Merge Group Markers into Chromium Traces.

gpu/command_buffer/service/gpu_tracer_unittest.cc

Index: gpu/command_buffer/service/gpu_tracer_unittest.cc
diff --git a/gpu/command_buffer/service/gpu_tracer_unittest.cc b/gpu/command_buffer/service/gpu_tracer_unittest.cc
index 70644b700492cf8c13985ebe072a1e7486c4a45c..d71127a2a4a76803a66c8c7081199497682482d8 100644
--- a/gpu/command_buffer/service/gpu_tracer_unittest.cc
+++ b/gpu/command_buffer/service/gpu_tracer_unittest.cc
@@ -220,7 +220,7 @@ class BaseGpuTraceTest : public BaseGpuTest {
 
   void DoTraceTest(bool tracing_service, bool tracing_device) {
     // Expected results
-    const GpuTracerSource tracer_source = kTraceGroupMarker;
+    const GpuTracerSource tracer_source = kTraceCHROMIUM;
     const std::string category_name("trace_category");
     const std::string trace_name("trace_test");
     const int64 offset_time = 3231;
@@ -422,7 +422,7 @@ class BaseGpuTracerTest : public BaseGpuTest {
     ExpectTracerOffsetQueryMocks();
     gl_fake_queries_.ExpectGetErrorCalls(*gl_);
 
-    const GpuTracerSource tracer_source = kTraceGroupMarker;
+    const GpuTracerSource tracer_source = kTraceCHROMIUM;
     const std::string category_name("trace_category");
     const std::string trace_name("trace_test");
     const GpuTracerSource source = static_cast<GpuTracerSource>(0);
@@ -579,11 +579,11 @@ TEST_F(GPUTracerTest, TraceDuringDecodeTest) {
   const std::string trace_name("trace_test");
 
   EXPECT_FALSE(
-      tracer_tester_->Begin(category_name, trace_name, kTraceGroupMarker));
+      tracer_tester_->Begin(category_name, trace_name, kTraceCHROMIUM));
 
   ASSERT_TRUE(tracer_tester_->BeginDecoding());
   EXPECT_TRUE(
-      tracer_tester_->Begin(category_name, trace_name, kTraceGroupMarker));
+      tracer_tester_->Begin(category_name, trace_name, kTraceCHROMIUM));
   ASSERT_TRUE(tracer_tester_->EndDecoding());
 }