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

content/common/gpu/client/gpu_channel_host.cc

Index: content/common/gpu/client/gpu_channel_host.cc
diff --git a/content/common/gpu/client/gpu_channel_host.cc b/content/common/gpu/client/gpu_channel_host.cc
index 8ff3ab854d74ed352df8d0fca2916151ba29f568..30700df21b0dd0f70b59ea7b2a3d255eb708e4c4 100644
--- a/content/common/gpu/client/gpu_channel_host.cc
+++ b/content/common/gpu/client/gpu_channel_host.cc
@@ -398,8 +398,7 @@
   return next_stream_id_.GetNext();
 }
 
-uint32_t GpuChannelHost::ValidateFlushIDReachedServer(int32 stream_id,
-                                                      bool force_validate) {
+uint32_t GpuChannelHost::ValidateFlushIDReachedServer(int32 stream_id) {
   // Store what flush ids we will be validating for all streams.
   base::hash_map<int32, uint32_t> validate_flushes;
   uint32_t flushed_stream_flush_id = 0;
@@ -422,7 +421,7 @@
     }
   }
 
-  if (!force_validate && flushed_stream_flush_id == verified_stream_flush_id) {
+  if (flushed_stream_flush_id == verified_stream_flush_id) {
     // Current stream has no unverified flushes.
     return verified_stream_flush_id;
   }