Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

gpu/perftests/measurements.h

 // 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.
 
 #ifndef GPU_PERFTESTS_MEASUREMENTS_H_
 #define GPU_PERFTESTS_MEASUREMENTS_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
+#include "gpu/command_buffer/service/gpu_timing.h"
+#include "ui/gl/gl_bindings.h"
 
 namespace gpu {
-class GPUTiming;
-class GPUTimer;
 struct Measurement {
   Measurement();
   Measurement(const Measurement& m);
   Measurement(const std::string& name,
               const base::TimeDelta wall_time,
               const base::TimeDelta cpu_time,
               const base::TimeDelta gpu_time);
   ~Measurement();
 
   void PrintResult() const;
@@ skipping 21 matching lines @@
   base::TimeTicks cpu_time_start_;
   scoped_ptr<gpu::GPUTimer> gpu_timer_;
 
   base::TimeDelta wall_time_;
   base::TimeDelta cpu_time_;
 };
 
 }  // namespace gpu
 
 #endif  // GPU_PERFTESTS_MEASUREMENTS_H_