Changed the GPU Tracer so the category names can be customized.

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/gpu_service_test.h"
 #include "gpu/command_buffer/service/gpu_tracer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/gl/gl_mock.h"
 
 namespace gpu {
 namespace gles2 {
 
 using ::testing::Return;
 using ::testing::NotNull;
 using ::testing::AtLeast;
 using ::testing::Invoke;
 using ::testing::_;
 
 class MockOutputter : public Outputter {
  public:
   MockOutputter() {}
-  MOCK_METHOD3(Trace,
-               void(const std::string& name, int64 start_time, int64 end_time));
+  MOCK_METHOD4(Trace,
+               void(const std::string& category, const std::string& name,
+                    int64 start_time, int64 end_time));
 
  protected:
   ~MockOutputter() {}
 };
 
 class GlFakeQueries {
  public:
   GlFakeQueries() {}
 
   void Reset() {
@@ skipping 69 matching lines @@
 
   ///////////////////////////////////////////////////////////////////////////
 
   void DoTraceTest() {
     MockOutputter* outputter = new MockOutputter();
     scoped_refptr<Outputter> outputter_ref = outputter;
 
     SetupTimerQueryMocks();
 
     // Expected results
+    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;
 
     // Expected Outputter::Trace call
     EXPECT_CALL(*outputter,
-                Trace(trace_name, expect_start_time, expect_end_time));
+                Trace(category_name, trace_name,
+                      expect_start_time, expect_end_time));
 
     scoped_refptr<GPUTrace> trace =
-        new GPUTrace(outputter_ref, trace_name, offset_time,
-                     GetTracerType());
+        new GPUTrace(outputter_ref, category_name, trace_name,
+                     offset_time, GetTracerType());
 
     gl_fake_queries_.SetCurrentGLTime(start_timestamp);
-    trace->Start();
+    trace->Start(true);
 
     // Shouldn't be available before End() call
     gl_fake_queries_.SetCurrentGLTime(end_timestamp);
     EXPECT_FALSE(trace->IsAvailable());
 
-    trace->End();
+    trace->End(true);
 
     // Shouldn't be available until the queries complete
     gl_fake_queries_.SetCurrentGLTime(end_timestamp -
                                       base::Time::kNanosecondsPerMicrosecond);
     EXPECT_FALSE(trace->IsAvailable());
 
     // Now it should be available
     gl_fake_queries_.SetCurrentGLTime(end_timestamp);
     EXPECT_TRUE(trace->IsAvailable());
 
@@ skipping 63 matching lines @@
 
 TEST_F(GpuDisjointTimerTracerTest, GPUTrace) {
   // Test basic timer query functionality
   {
     DoTraceTest();
   }
 }
 
 }  // namespace gles2
 }  // namespace gpu