cc: Remove disabled LatencyQuery logic in OutputSurface

cc/output/output_surface.h

Index: cc/output/output_surface.h
diff --git a/cc/output/output_surface.h b/cc/output/output_surface.h
index 98a48304b8b1fa0c85c700cd7c4a5d38d4de335e..4ba3e5f2b225ca6dd1f681b936edbdc0e9e61af7 100644
--- a/cc/output/output_surface.h
+++ b/cc/output/output_surface.h
@@ -138,10 +138,6 @@ class CC_EXPORT OutputSurface {
 
   bool HasClient() { return !!client_; }
 
-  // Returns an estimate of the current GPU latency. When only a software
-  // device is present, returns 0.
-  base::TimeDelta GpuLatencyEstimate();
-
   // Get the class capable of informing cc of hardware overlay capability.
   OverlayCandidateValidator* overlay_candidate_validator() const {
     return overlay_candidate_validator_.get();
@@ -181,16 +177,11 @@ class CC_EXPORT OutputSurface {
   void SetUpContext3d();
   void ResetContext3d();
   void SetMemoryPolicy(const ManagedMemoryPolicy& policy);
-  void UpdateAndMeasureGpuLatency();
 
   bool external_stencil_test_enabled_;
 
   base::WeakPtrFactory<OutputSurface> weak_ptr_factory_;
 
-  std::deque<unsigned> available_gpu_latency_query_ids_;
-  std::deque<unsigned> pending_gpu_latency_query_ids_;
-  RollingTimeDeltaHistory gpu_latency_history_;
-
   DISALLOW_COPY_AND_ASSIGN(OutputSurface);
 };