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

content/renderer/media/android/webmediaplayer_android.cc

 // Copyright 2013 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/renderer/media/android/webmediaplayer_android.h"
 
 #include <limits>
 
 #include "base/android/build_info.h"
 #include "base/bind.h"
@@ skipping 118 matching lines @@
   bitmap->setPixelRef(pixel_ref)->unref();
   return true;
 }
 
 class SyncTokenClientImpl : public media::VideoFrame::SyncTokenClient {
  public:
   explicit SyncTokenClientImpl(
       blink::WebGraphicsContext3D* web_graphics_context)
       : web_graphics_context_(web_graphics_context) {}
   ~SyncTokenClientImpl() override {}
-  void GenerateSyncToken(gpu::SyncToken* sync_token) override {
-    if (!web_graphics_context_->insertSyncPoint(sync_token->GetData())) {
-      sync_token->Clear();
-    }
+  uint32 InsertSyncPoint() override {
+    gpu::SyncToken sync_token;
+    if (!web_graphics_context_->insertSyncPoint(sync_token.GetData()))
+      return 0;
+    return static_cast<uint32>(sync_token.release_count());
   }
   void WaitSyncToken(const gpu::SyncToken& sync_token) override {
     web_graphics_context_->waitSyncToken(sync_token.GetConstData());
   }
 
  private:
   blink::WebGraphicsContext3D* web_graphics_context_;
 };
 
 }  // namespace
@@ skipping 1768 matching lines @@
 
   bool is_hls = IsHLSStream();
   UMA_HISTOGRAM_BOOLEAN("Media.Android.IsHttpLiveStreamingMedia", is_hls);
   if (is_hls) {
     media::RecordOriginOfHLSPlayback(
         GURL(frame_->document().securityOrigin().toString()));
   }
 }
 
 }  // namespace content