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..6269034ba97b1b4e93940b7073aa950de237c4b0 100644
--- a/webrtc/media/engine/webrtcvideoframe.h
+++ b/webrtc/media/engine/webrtcvideoframe.h
@@ -19,6 +19,7 @@
 #include "webrtc/common_types.h"
 #include "webrtc/common_video/include/video_frame_buffer.h"
 #include "webrtc/media/base/videoframe.h"
+#include "webrtc/base/gtest_prod_util.h"

[Taylor Brandstetter, 2016/06/23 23:39:51]

It looks like this broke the FYI bot, because Chromoting includes both this
gtest_prod_util and Chrome's gtest_prod_util. The macros in ours should probably
have an "RTC_" prefix added.

[Sergey Ulanov, 2016/06/24 00:30:03]

yep. I'm going to revert to the previous version of this CL that didn't need 
FRIEND_TEST_ALL_PREFIXES.

 
 namespace cricket {
 
@@ -61,7 +62,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 +85,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 +102,8 @@ class WebRtcVideoFrame : public VideoFrame {
              bool apply_rotation);
 
  private:
-  VideoFrame* CreateEmptyFrame(int w, int h,
-                               int64_t time_stamp_ns) const override;
+  // The test mutates |rotation_|, so it needs to be a friend.
+  FRIEND_TEST_ALL_PREFIXES(WebRtcVideoFrameTest, ApplyRotationToFrame);
 
   // An opaque reference counted handle that stores the pixel data.
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer_;