Revert of [headless] Fix screenshots with gpu enabled.

content/browser/compositor/offscreen_browser_compositor_output_surface.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 "content/browser/compositor/offscreen_browser_compositor_output_surface.h"
 
 #include <utility>
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "cc/output/output_surface_client.h"
 #include "cc/output/output_surface_frame.h"
 #include "cc/resources/resource_provider.h"
 #include "components/display_compositor/compositor_overlay_candidate_validator.h"
 #include "content/browser/compositor/reflector_impl.h"
 #include "content/browser/compositor/reflector_texture.h"
-#include "content/browser/renderer_host/render_widget_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "gpu/command_buffer/client/context_support.h"
 #include "gpu/command_buffer/client/gles2_interface.h"
 #include "services/ui/public/cpp/gpu/context_provider_command_buffer.h"
 #include "third_party/khronos/GLES2/gl2.h"
 #include "third_party/khronos/GLES2/gl2ext.h"
 
 using gpu::gles2::GLES2Interface;
 
 namespace content {
@@ skipping 122 matching lines @@
   gpu::gles2::GLES2Interface* gl = context_provider_->ContextGL();
   const GLuint64 fence_sync = gl->InsertFenceSyncCHROMIUM();
   gl->ShallowFlushCHROMIUM();
 
   gpu::SyncToken sync_token;
   gl->GenUnverifiedSyncTokenCHROMIUM(fence_sync, sync_token.GetData());
   context_provider_->ContextSupport()->SignalSyncToken(
       sync_token,
       base::Bind(
           &OffscreenBrowserCompositorOutputSurface::OnSwapBuffersComplete,
-          weak_ptr_factory_.GetWeakPtr(), frame.latency_info));
+          weak_ptr_factory_.GetWeakPtr()));
 }
 
 bool OffscreenBrowserCompositorOutputSurface::IsDisplayedAsOverlayPlane()
     const {
   return false;
 }
 
 unsigned OffscreenBrowserCompositorOutputSurface::GetOverlayTextureId() const {
   return 0;
 }
 
 bool OffscreenBrowserCompositorOutputSurface::SurfaceIsSuspendForRecycle()
     const {
   return false;
 }
 
 GLenum
 OffscreenBrowserCompositorOutputSurface::GetFramebufferCopyTextureFormat() {
   return GLCopyTextureInternalFormat(kFboTextureFormat);
 }
 
 void OffscreenBrowserCompositorOutputSurface::OnReflectorChanged() {
   if (reflector_) {
     reflector_changed_ = true;
     EnsureBackbuffer();
   }
 }
 
-void OffscreenBrowserCompositorOutputSurface::OnSwapBuffersComplete(
-    const std::vector<ui::LatencyInfo>& latency_info) {
-  RenderWidgetHostImpl::CompositorFrameDrawn(latency_info);
+void OffscreenBrowserCompositorOutputSurface::OnSwapBuffersComplete() {
   client_->DidReceiveSwapBuffersAck();
 }
 
 }  // namespace content