Revert of Converted video frame and image callbacks to use new sync tokens.

content/browser/renderer_host/media/video_capture_controller.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_controller.h"
 
 #include <map>
 #include <set>
 
 #include "base/bind.h"
@@ skipping 27 matching lines @@
 
 #define UMA_HISTOGRAM_ASPECT_RATIO(name, width, height) \
     UMA_HISTOGRAM_SPARSE_SLOWLY( \
         name, \
         (height) ? ((width) * 100) / (height) : kInfiniteRatio);
 
 class SyncTokenClientImpl : public VideoFrame::SyncTokenClient {
  public:
   explicit SyncTokenClientImpl(GLHelper* gl_helper) : gl_helper_(gl_helper) {}
   ~SyncTokenClientImpl() override {}
-  void GenerateSyncToken(gpu::SyncToken* sync_token) override {
-    gl_helper_->GenerateSyncToken(sync_token);
-  }
+  uint32 InsertSyncPoint() override { return gl_helper_->InsertSyncPoint(); }
   void WaitSyncToken(const gpu::SyncToken& sync_token) override {
     gl_helper_->WaitSyncToken(sync_token);
   }
 
  private:
   GLHelper* gl_helper_;
 };
 
 void ReturnVideoFrame(const scoped_refptr<VideoFrame>& video_frame,
                       const gpu::SyncToken& sync_token) {
@@ skipping 410 matching lines @@
     int session_id,
     const ControllerClients& clients) {
   for (auto client : clients) {
     if (client->session_id == session_id)
       return client;
   }
   return NULL;
 }
 
 }  // namespace content