Rebase of Removing gpu::SyncToken usage from video capture pipeline

content/browser/renderer_host/media/video_capture_host.cc

 // Copyright (c) 2012 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/renderer_host/media/video_capture_host.h"
 
 #include <memory>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 194 matching lines @@
     return;
 
   if (VideoCaptureController* controller = it->second.get()) {
     media_stream_manager_->video_capture_manager()
         ->RequestRefreshFrameForClient(controller);
   }
 }
 
 void VideoCaptureHost::ReleaseBuffer(int32_t device_id,
                                      int32_t buffer_id,
-                                     const gpu::SyncToken& sync_token,
                                      double consumer_resource_utilization) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   VideoCaptureControllerID controller_id(device_id);
   auto it = controllers_.find(controller_id);
   if (it == controllers_.end())
     return;
 
   const base::WeakPtr<VideoCaptureController>& controller = it->second;
   if (controller) {
-    controller->ReturnBuffer(controller_id, this, buffer_id, sync_token,
+    controller->ReturnBuffer(controller_id, this, buffer_id,
                              consumer_resource_utilization);
   }
 }
 
 void VideoCaptureHost::GetDeviceSupportedFormats(
     int32_t device_id,
     int32_t session_id,
     const GetDeviceSupportedFormatsCallback& callback) {
   DVLOG(1) << __func__ << " " << device_id;
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ skipping 90 matching lines @@
   const base::WeakPtr<VideoCaptureController> controller = it->second;
   controllers_.erase(it);
   if (!controller)
     return;
 
   media_stream_manager_->video_capture_manager()->StopCaptureForClient(
       controller.get(), controller_id, this, on_error);
 }
 
 }  // namespace content