Cleaned up deprecated elapsed_time methods and changed rotation to be webrtc::VideoRotation

talk/media/webrtc/webrtcvideoframe.h

 /*
  * libjingle
  * Copyright 2011 Google Inc.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
  *
  *  1. Redistributions of source code must retain the above copyright notice,
  *     this list of conditions and the following disclaimer.
  *  2. Redistributions in binary form must reproduce the above copyright notice,
@@ skipping 28 matching lines @@
 
 struct CapturedFrame;
 
 class WebRtcVideoFrame : public VideoFrame {
  public:
   WebRtcVideoFrame();
   WebRtcVideoFrame(const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer,
                    int64_t time_stamp_ns,
                    webrtc::VideoRotation rotation);
 
-  // TODO(guoweis): Remove this when chrome code base is updated.
-  WebRtcVideoFrame(const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& buffer,
-                   int64_t elapsed_time_ns,
-                   int64_t time_stamp_ns);
-
   ~WebRtcVideoFrame();
 
   // Creates a frame from a raw sample with FourCC "format" and size "w" x "h".
   // "h" can be negative indicating a vertically flipped image.
   // "dh" is destination height if cropping is desired and is always positive.
   // Returns "true" if successful.
   bool Init(uint32_t format,
             int w,
             int h,
             int dw,
             int dh,
             uint8_t* sample,
             size_t sample_size,
             size_t pixel_width,
             size_t pixel_height,
             int64_t time_stamp_ns,
             webrtc::VideoRotation rotation);
 
   bool Init(const CapturedFrame* frame, int dw, int dh, bool apply_rotation);
 
   void InitToEmptyBuffer(int w, int h, size_t pixel_width, size_t pixel_height,
                          int64_t time_stamp_ns);
 
-  // TODO(magjed): Remove once Chromium is updated.
-  bool InitToBlack(int w, int h, size_t pixel_width, size_t pixel_height,
-                   int64_t elapsed_time_ns, int64_t time_stamp_ns);
-
   bool InitToBlack(int w, int h, size_t pixel_width, size_t pixel_height,
                    int64_t time_stamp_ns) override;
 
   // From base class VideoFrame.
   bool Reset(uint32_t format,
                      int w,
                      int h,
                      int dw,
                      int dh,
                      uint8_t* sample,
@@ skipping 58 matching lines @@
   webrtc::VideoRotation rotation_;
 
   // This is mutable as the calculation is expensive but once calculated, it
   // remains const.
   mutable rtc::scoped_ptr<VideoFrame> rotated_frame_;
 };
 
 }  // namespace cricket
 
 #endif  // TALK_MEDIA_WEBRTCVIDEOFRAME_H_