Fixed GPU tracing so the categories do not get mixed.

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 3333e85b1138286269c5845607747e4a2cedefe1..ae4c970b78a36d2f148a62e05df349050fda14a7 100644
--- a/gpu/command_buffer/service/gpu_tracer_unittest.cc
+++ b/gpu/command_buffer/service/gpu_tracer_unittest.cc
@@ -527,9 +527,6 @@ class BaseGpuTracerTest : public BaseGpuTest {
 
       const GpuTracerSource source = static_cast<GpuTracerSource>(i);
       ASSERT_TRUE(tracer.Begin(source_category, source_trace_name, source));
-
-      ASSERT_EQ(source_category, tracer.CurrentCategory());
-      ASSERT_EQ(source_trace_name, tracer.CurrentName());
     }
 
     for (int i = 0; i < NUM_TRACER_SOURCES; ++i) {
@@ -550,6 +547,11 @@ class BaseGpuTracerTest : public BaseGpuTest {
                               GetTracerType() != kTracerTypeInvalid);
 
       const GpuTracerSource source = static_cast<GpuTracerSource>(i);
+
+      // Check if the current category/name are correct for this source.
+      ASSERT_EQ(source_category, tracer.CurrentCategory(source));
+      ASSERT_EQ(source_trace_name, tracer.CurrentName(source));
+
       ASSERT_TRUE(tracer.End(source));
     }