GPU Tracer no longer issue device traces when device category is off.

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 "base/bind.h"
 #include "gpu/command_buffer/service/gles2_cmd_decoder_mock.h"
 #include "gpu/command_buffer/service/gpu_service_test.h"
@@ skipping 276 matching lines @@
                               expect_start_time, expect_end_time))
           .Times(Exactly(1));
     } else {
       EXPECT_CALL(*outputter, TraceDevice(category, name,
                                           expect_start_time, expect_end_time))
           .Times(Exactly(0));
     }
   }
 
   void ExpectOutputterMocks(MockOutputter* outputter,
+                            bool tracing_device,
                             const std::string& category,
                             const std::string& name, int64 expect_start_time,
                             int64 expect_end_time) {
     ExpectOutputterBeginMocks(outputter, category, name);
-    bool valid_timer = gpu_timing_client_->IsAvailable() &&
+    bool valid_timer = tracing_device &&
+                       gpu_timing_client_->IsAvailable() &&
                        gpu_timing_client_->IsTimerOffsetAvailable();
     ExpectOutputterEndMocks(outputter, category, name, expect_start_time,
                             expect_end_time, valid_timer);
   }
 
   void ExpectTracerOffsetQueryMocks() {
     if (GetTimerType() != gfx::GPUTiming::kTimerTypeARB) {
       EXPECT_CALL(*gl_, GetInteger64v(GL_TIMESTAMP, NotNull()))
           .Times(Exactly(0));
     } else {
@@ skipping 12 matching lines @@
   scoped_refptr<gfx::GPUTimingClient> gpu_timing_client_;
   scoped_refptr<MockOutputter> outputter_ref_;
 };
 
 // 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() {
+  void DoTraceTest(bool tracing_service, bool tracing_device) {
     // 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;
 
-    ExpectTraceQueryMocks();
-    ExpectOutputterMocks(outputter_ref_.get(), category_name, trace_name,
-                         expect_start_time, expect_end_time);
+    if (tracing_service)
+      ExpectOutputterMocks(outputter_ref_.get(), tracing_device, category_name,
+                           trace_name, expect_start_time, expect_end_time);
+
+    if (tracing_device)
+      ExpectTraceQueryMocks();
 
     scoped_refptr<GPUTrace> trace = new GPUTrace(
         outputter_ref_, gpu_timing_client_.get(),
-        category_name, trace_name, true);
+        category_name, trace_name, tracing_service, tracing_device);
 
     gl_fake_queries_.SetCurrentGLTime(start_timestamp);
     g_fakeCPUTime = expect_start_time;
-    trace->Start(true);
+    trace->Start();
 
     // Shouldn't be available before End() call
     gl_fake_queries_.SetCurrentGLTime(end_timestamp);
     g_fakeCPUTime = expect_end_time;
-    EXPECT_FALSE(trace->IsAvailable());
+    if (tracing_device)
+      EXPECT_FALSE(trace->IsAvailable());
 
-    trace->End(true);
+    trace->End();
 
     // Shouldn't be available until the queries complete
     gl_fake_queries_.SetCurrentGLTime(end_timestamp -
                                       base::Time::kNanosecondsPerMicrosecond);
-    EXPECT_FALSE(trace->IsAvailable());
+    if (tracing_device)
+      EXPECT_FALSE(trace->IsAvailable());
 
     // Now it should be available
     gl_fake_queries_.SetCurrentGLTime(end_timestamp);
     EXPECT_TRUE(trace->IsAvailable());
 
     // Proces should output expected Trace results to MockOutputter
     trace->Process();
 
     // Destroy trace after we are done.
     trace->Destroy(true);
 
     outputter_ref_ = NULL;
   }
 };
 
 class GpuARBTimerTraceTest : public BaseGpuTraceTest {
  public:
   GpuARBTimerTraceTest() : BaseGpuTraceTest(gfx::GPUTiming::kTimerTypeARB) {}
 };
 
 class GpuDisjointTimerTraceTest : public BaseGpuTraceTest {
  public:
   GpuDisjointTimerTraceTest()
       : BaseGpuTraceTest(gfx::GPUTiming::kTimerTypeDisjoint) {}
 };
 
-TEST_F(GpuARBTimerTraceTest, ARBTimerTraceTest) {
-  DoTraceTest();
+TEST_F(GpuARBTimerTraceTest, ARBTimerTraceTestOff) {
+  DoTraceTest(false, false);
 }
 
-TEST_F(GpuDisjointTimerTraceTest, DisjointTimerTraceTest) {
-  DoTraceTest();
+TEST_F(GpuARBTimerTraceTest, ARBTimerTraceTestServiceOnly) {
+  DoTraceTest(true, false);
+}
+
+TEST_F(GpuARBTimerTraceTest, ARBTimerTraceTestDeviceOnly) {
+  DoTraceTest(false, true);
+}
+
+TEST_F(GpuARBTimerTraceTest, ARBTimerTraceTestBothOn) {
+  DoTraceTest(true, true);
+}
+
+TEST_F(GpuDisjointTimerTraceTest, DisjointTimerTraceTestOff) {
+  DoTraceTest(false, false);
+}
+
+TEST_F(GpuDisjointTimerTraceTest, DisjointTimerTraceTestServiceOnly) {
+  DoTraceTest(true, false);
+}
+
+TEST_F(GpuDisjointTimerTraceTest, DisjointTimerTraceTestDeviceOnly) {
+  DoTraceTest(false, true);
+}
+
+TEST_F(GpuDisjointTimerTraceTest, DisjointTimerTraceTestBothOn) {
+  DoTraceTest(true, true);
 }
 
 // Test GPUTracer calls all the correct gl calls.
 class BaseGpuTracerTest : public BaseGpuTest {
  public:
   explicit BaseGpuTracerTest(gfx::GPUTiming::TimerType test_timer_type)
       : BaseGpuTest(test_timer_type) {}
 
   void DoBasicTracerTest() {
     ExpectTracerOffsetQueryMocks();
@@ skipping 290 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