Fix GPU tracing offset calculation on android.

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 338 matching lines @@
 
     gpu_timing_.SetOffsetForTesting(
         offset_time, test_timer_type_ == GPUTiming::kTimerTypeARB);
 
     gl_fake_queries_.SetCurrentGLTime(start_timestamp);
     g_fakeCPUTime = expect_start_time;
     trace->Start(true);
 
     // Shouldn't be available before End() call
     gl_fake_queries_.SetCurrentGLTime(end_timestamp);
+    g_fakeCPUTime = expect_end_time;
     EXPECT_FALSE(trace->IsAvailable());
 
     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
@@ skipping 98 matching lines @@
 
       const GpuTracerSource source = static_cast<GpuTracerSource>(i);
       ASSERT_TRUE(tracer.Begin(source_category, source_trace_name, source));
     }
 
     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));
-      g_fakeCPUTime = expect_start_time + i;
+      g_fakeCPUTime = 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,
                               GetTimerType() != GPUTiming::kTimerTypeInvalid);
@@ skipping 151 matching lines @@
 
   ASSERT_TRUE(tracer_tester_->BeginDecoding());
   EXPECT_TRUE(
       tracer_tester_->Begin(category_name, trace_name, kTraceGroupMarker));
   ASSERT_TRUE(tracer_tester_->EndDecoding());
 }
 
 }  // namespace
 }  // namespace gles2
 }  // namespace gpu