Merge Group Markers into Chromium Traces.

gpu/command_buffer/service/gpu_tracer_unittest.cc

 // Copyright 2014 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.
 
 #include "base/bind.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"
 #include "gpu/command_buffer/service/gpu_service_test.h"
 #include "gpu/command_buffer/service/gpu_tracer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_context.h"
@@ skipping 209 matching lines @@
 };
 
 // Test GPUTrace calls all the correct gl calls.
 class BaseGpuTraceTest : public BaseGpuTest {
  public:
   explicit BaseGpuTraceTest(gfx::GPUTiming::TimerType test_timer_type)
       : BaseGpuTest(test_timer_type) {}
 
   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;
     const GLint64 start_timestamp = 7 * base::Time::kNanosecondsPerMicrosecond;
     const GLint64 end_timestamp = 32 * base::Time::kNanosecondsPerMicrosecond;
     const int64 expect_start_time =
         (start_timestamp / base::Time::kNanosecondsPerMicrosecond) +
         offset_time;
     const int64 expect_end_time =
         (end_timestamp / base::Time::kNanosecondsPerMicrosecond) + offset_time;
@@ skipping 518 matching lines @@
   EXPECT_FALSE(tracer_tester_->BeginDecoding());
   ASSERT_TRUE(tracer_tester_->EndDecoding());
   EXPECT_FALSE(tracer_tester_->EndDecoding());
 }
 
 TEST_F(GPUTracerTest, TraceDuringDecodeTest) {
   const std::string category_name("trace_category");
   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());
 }
 
 TEST_F(GpuDisjointTimerTracerTest, MultipleClientsDisjointTest) {
   scoped_refptr<gfx::GPUTimingClient> client1 =
       GetGLContext()->CreateGPUTimingClient();
   scoped_refptr<gfx::GPUTimingClient>  client2 =
       GetGLContext()->CreateGPUTimingClient();
 
   // Test both clients are initialized as no errors.
@@ skipping 17 matching lines @@
   scoped_refptr<gfx::GPUTimingClient>  client3 =
       GetGLContext()->CreateGPUTimingClient();
   ASSERT_TRUE(client1->CheckAndResetTimerErrors());
   ASSERT_TRUE(client2->CheckAndResetTimerErrors());
   ASSERT_FALSE(client3->CheckAndResetTimerErrors());
 }
 
 }  // namespace
 }  // namespace gles2
 }  // namespace gpu