Fixit: Fork base::TimeTicks --> TimeTicks + ThreadTicks + TraceTicks

gpu/perftests/measurements.cc

 // Copyright 2015 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 "gpu/perftests/measurements.h"
 
 #include "base/logging.h"
 #include "testing/perf/perf_test.h"
 #include "ui/gl/gpu_timing.h"
 
@@ skipping 37 matching lines @@
 Measurement Measurement::Divide(int a) const {
   return Measurement(name, wall_time / a, cpu_time / a, gpu_time / a);
 }
 
 Measurement::~Measurement() {
 }
 
 MeasurementTimers::MeasurementTimers(gfx::GPUTimingClient* gpu_timing_client)
     : wall_time_start_(), cpu_time_start_(), gpu_timer_() {
   DCHECK(gpu_timing_client);
-  wall_time_start_ = base::TimeTicks::NowFromSystemTraceTime();
-  if (base::TimeTicks::IsThreadNowSupported()) {
-    cpu_time_start_ = base::TimeTicks::ThreadNow();
+  wall_time_start_ = base::TraceTicks::Now();
+  if (base::ThreadTicks::IsSupported()) {
+    cpu_time_start_ = base::ThreadTicks::Now();
   } else {
     static bool logged_once = false;
-    LOG_IF(WARNING, !logged_once) << "ThreadNow not supported.";
+    LOG_IF(WARNING, !logged_once) << "ThreadTicks not supported.";
     logged_once = true;
   }
 
   if (gpu_timing_client->IsAvailable()) {
     gpu_timer_ = gpu_timing_client->CreateGPUTimer();
     gpu_timer_->Start();
   }
 }
 
 void MeasurementTimers::Record() {
-  wall_time_ = base::TimeTicks::NowFromSystemTraceTime() - wall_time_start_;
-  if (base::TimeTicks::IsThreadNowSupported()) {
-    cpu_time_ = base::TimeTicks::ThreadNow() - cpu_time_start_;
+  wall_time_ = base::TraceTicks::Now() - wall_time_start_;
+  if (base::ThreadTicks::IsSupported()) {
+    cpu_time_ = base::ThreadTicks::Now() - cpu_time_start_;
   }
   if (gpu_timer_.get()) {
     gpu_timer_->End();
   }
 }
 
 Measurement MeasurementTimers::GetAsMeasurement(const std::string& name) {
   DCHECK_NE(base::TimeDelta(),
             wall_time_);  // At least wall_time_ has been set.
 
-  if (!base::TimeTicks::IsThreadNowSupported()) {
+  if (!base::ThreadTicks::IsSupported()) {
     cpu_time_ = base::TimeDelta::FromMicroseconds(-1);
   }
   int64 gpu_time = -1;
   if (gpu_timer_.get() != nullptr && gpu_timer_->IsAvailable()) {
     gpu_time = gpu_timer_->GetDeltaElapsed();
   }
   return Measurement(name, wall_time_, cpu_time_,
                      base::TimeDelta::FromMicroseconds(gpu_time));
 }
 
 MeasurementTimers::~MeasurementTimers() {
   if (gpu_timer_.get()) {
     gpu_timer_->Destroy(true);
   }
 }
 
 }  // namespace gpu