Fixed GPU tracing so the categories do not get mixed.

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 <map>
 #include <set>
 
 #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"
@@ skipping 509 matching lines @@
       // Each trace name should be different to differentiate.
       const char num_char = static_cast<char>('0' + i);
       std::string source_category = category_name + num_char;
       std::string source_trace_name = trace_name + num_char;
 
       ExpectOutputterBeginMocks(outputter_ref_.get(),
                                 source_category, source_trace_name);
 
       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) {
       // Set times so each source has a different time.
       gl_fake_queries_.SetCurrentGLTime(
           end_timestamp +
           (i * base::Time::kNanosecondsPerMicrosecond));
       cpu_time_ref_->SetFakeCPUTime(expect_end_time + i);
 
       // Each trace name should be different to differentiate.
       const char num_char = static_cast<char>('0' + i);
       std::string source_category = category_name + num_char;
       std::string source_trace_name = trace_name + num_char;
 
       ExpectOutputterEndMocks(outputter_ref_.get(), source_category,
                               source_trace_name,
                               expect_start_time + i, expect_end_time + i,
                               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));
     }
 
     ASSERT_TRUE(tracer.EndDecoding());
 
     outputter_ref_ = NULL;
     cpu_time_ref_ = NULL;
   }
 
   void DoDisjointTest() {
@@ skipping 126 matching lines @@
                                    kTraceGroupMarker));
 
   ASSERT_TRUE(tracer_tester.BeginDecoding());
   EXPECT_TRUE(tracer_tester.Begin(category_name, trace_name,
                                   kTraceGroupMarker));
   ASSERT_TRUE(tracer_tester.EndDecoding());
 }
 
 }  // namespace gles2
 }  // namespace gpu