Modified old wait sync point functions to also accept new sync tokens.

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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/browser/browser_main_loop.h"
@@ skipping 254 matching lines @@
   if (it->second) {
     media_stream_manager_->video_capture_manager()->ResumeCaptureForClient(
         session_id, params, it->second.get(), controller_id, this);
   }
 }
 
 void VideoCaptureHost::OnRendererFinishedWithBuffer(
     int device_id,
     int buffer_id,
     uint32 sync_point,
+    const gpu::SyncToken& sync_token,
     double consumer_resource_utilization) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
 
   VideoCaptureControllerID controller_id(device_id);
   EntryMap::iterator it = entries_.find(controller_id);
   if (it != entries_.end()) {
     const base::WeakPtr<VideoCaptureController>& controller = it->second;
     if (controller) {
-      controller->ReturnBuffer(controller_id,
-                               this,
-                               buffer_id,
-                               sync_point,
-                               consumer_resource_utilization);
+      controller->ReturnBuffer(controller_id, this, buffer_id, sync_point,
+                               sync_token, consumer_resource_utilization);
     }
   }
 }
 
 void VideoCaptureHost::OnGetDeviceSupportedFormats(
     int device_id,
     media::VideoCaptureSessionId capture_session_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
   DVLOG(1) << "VideoCaptureHost::OnGetDeviceFormats, capture_session_id "
            << capture_session_id;
@@ skipping 34 matching lines @@
     return;
 
   if (it->second) {
     media_stream_manager_->video_capture_manager()->StopCaptureForClient(
         it->second.get(), controller_id, this, on_error);
   }
   entries_.erase(it);
 }
 
 }  // namespace content