Reland of Delete all use of cricket::VideoFrame and cricket::WebRtcVideoFrame.

webrtc/api/videotracksource.h

Index: webrtc/api/videotracksource.h
diff --git a/webrtc/api/videotracksource.h b/webrtc/api/videotracksource.h
index 67e764fd40e5ad48f45d5fc746027263b408ae4b..330af2332e6ec500831a67c04d8e5c35a66fd5d2 100644
--- a/webrtc/api/videotracksource.h
+++ b/webrtc/api/videotracksource.h
@@ -22,8 +22,7 @@ namespace webrtc {
 
 class VideoTrackSource : public Notifier<VideoTrackSourceInterface> {
  public:
-  VideoTrackSource(rtc::VideoSourceInterface<cricket::VideoFrame>* source,
-                   bool remote);
+  VideoTrackSource(rtc::VideoSourceInterface<VideoFrame>* source, bool remote);
   void SetState(SourceState new_state);
   // OnSourceDestroyed clears this instance pointer to |source_|. It is useful
   // when the underlying rtc::VideoSourceInterface is destroyed before the
@@ -39,13 +38,13 @@ class VideoTrackSource : public Notifier<VideoTrackSourceInterface> {
 
   bool GetStats(Stats* stats) override { return false; }
 
-  void AddOrUpdateSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink,
+  void AddOrUpdateSink(rtc::VideoSinkInterface<VideoFrame>* sink,
                        const rtc::VideoSinkWants& wants) override;
-  void RemoveSink(rtc::VideoSinkInterface<cricket::VideoFrame>* sink) override;
+  void RemoveSink(rtc::VideoSinkInterface<VideoFrame>* sink) override;
 
  private:
   rtc::ThreadChecker worker_thread_checker_;
-  rtc::VideoSourceInterface<cricket::VideoFrame>* source_;
+  rtc::VideoSourceInterface<VideoFrame>* source_;
   cricket::VideoOptions options_;
   SourceState state_;
   const bool remote_;