Cleanups in cricket::VideoFrame and cricket::WebRtcVideoFrame.

webrtc/media/engine/webrtcvideoframe.h

Index: webrtc/media/engine/webrtcvideoframe.h
diff --git a/webrtc/media/engine/webrtcvideoframe.h b/webrtc/media/engine/webrtcvideoframe.h
index 487e32ef9af23630f749f65dca93558d80555eef..0d2ce3e71d507a73136f9fa8e0028f5bfa197940 100644
--- a/webrtc/media/engine/webrtcvideoframe.h
+++ b/webrtc/media/engine/webrtcvideoframe.h
@@ -61,7 +61,6 @@ class WebRtcVideoFrame : public VideoFrame {
   bool Init(const CapturedFrame* frame, int dw, int dh, bool apply_rotation);
 
   void InitToEmptyBuffer(int w, int h);
-  void InitToEmptyBuffer(int w, int h, int64_t time_stamp_ns);
 
   int width() const override;
   int height() const override;
@@ -85,9 +84,6 @@ class WebRtcVideoFrame : public VideoFrame {
   const VideoFrame* GetCopyWithRotationApplied() const override;
 
  protected:
-  void set_rotation(webrtc::VideoRotation rotation) override {
-    rotation_ = rotation;
-  }
   // Creates a frame from a raw sample with FourCC |format| and size |w| x |h|.
   // |h| can be negative indicating a vertically flipped image.
   // |dw| is destination width; can be less than |w| if cropping is desired.
@@ -105,8 +101,8 @@ class WebRtcVideoFrame : public VideoFrame {
              bool apply_rotation);
 
  private:
-  VideoFrame* CreateEmptyFrame(int w, int h,
-                               int64_t time_stamp_ns) const override;
+  // Tests mutate |rotataion_|, so the base test class is a friend.

[nisse-webrtc, 2016/06/21 07:52:35]

Spelling |rotation_|, otherwise good. 

Ultimately I'd like to move or delete GetCopyWithRotationApplied, and then I'd
expect this friend declaration can go away too.

[Sergey Ulanov, 2016/06/21 17:25:56]

Done.

+  friend class WebRtcVideoFrameTest;
 
   // An opaque reference counted handle that stores the pixel data.
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer_;
@@ -115,7 +111,7 @@ class WebRtcVideoFrame : public VideoFrame {
 
   // This is mutable as the calculation is expensive but once calculated, it
   // remains const.
-  mutable std::unique_ptr<VideoFrame> rotated_frame_;
+  mutable std::unique_ptr<WebRtcVideoFrame> rotated_frame_;
 };
 
 }  // namespace cricket