Refactored GLContext to own GPUTiming which spawn GPUTimingClients.

gpu/perftests/measurements.cc

Index: gpu/perftests/measurements.cc
diff --git a/gpu/perftests/measurements.cc b/gpu/perftests/measurements.cc
index f94d1cb8dcd1c3638df78a41a98d19a3eaf5e0b9..ef9b18477c5dee8b558fb148eacb3f23f227803a 100644
--- a/gpu/perftests/measurements.cc
+++ b/gpu/perftests/measurements.cc
@@ -5,8 +5,8 @@
 #include "gpu/perftests/measurements.h"
 
 #include "base/logging.h"
-#include "gpu/command_buffer/service/gpu_timing.h"
 #include "testing/perf/perf_test.h"
+#include "ui/gl/gpu_timing.h"
 
 namespace gpu {
 
@@ -52,9 +52,9 @@ Measurement Measurement::Divide(int a) const {
 Measurement::~Measurement() {
 }
 
-MeasurementTimers::MeasurementTimers(GPUTiming* gpu_timing)
+MeasurementTimers::MeasurementTimers(GPUTimingClient* gpu_timing_client)
     : wall_time_start_(), cpu_time_start_(), gpu_timer_() {
-  DCHECK(gpu_timing);
+  DCHECK(gpu_timing_client);
   wall_time_start_ = base::TimeTicks::NowFromSystemTraceTime();
   if (base::TimeTicks::IsThreadNowSupported()) {
     cpu_time_start_ = base::TimeTicks::ThreadNow();
@@ -64,8 +64,8 @@ MeasurementTimers::MeasurementTimers(GPUTiming* gpu_timing)
     logged_once = true;
   }
 
-  if (gpu_timing->IsAvailable()) {
-    gpu_timer_.reset(new GPUTimer(gpu_timing));
+  if (gpu_timing_client->IsAvailable()) {
+    gpu_timer_.reset(new GPUTimer(gpu_timing_client));
     gpu_timer_->Start();
   }
 }