Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b"

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 "gpu/command_buffer/service/gpu_timing.h"
 #include "testing/perf/perf_test.h"
 
 namespace gpu {
 
 Measurement::Measurement() : name(), wall_time(), cpu_time(), gpu_time() {
 }
 Measurement::Measurement(const Measurement& m)
     : name(m.name),
       wall_time(m.wall_time),
       cpu_time(m.cpu_time),
@@ skipping 73 matching lines @@
     gpu_time = gpu_timer_->GetDeltaElapsed();
   }
   return Measurement(name, wall_time_, cpu_time_,
                      base::TimeDelta::FromMicroseconds(gpu_time));
 }
 
 MeasurementTimers::~MeasurementTimers() {
 }
 
 }  // namespace gpu