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

webrtc/media/engine/webrtcvideoframe.h

 /*
  *  Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
 #ifndef WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_
 #define WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_
 
 #include <memory>
 
 #include "webrtc/base/buffer.h"
 #include "webrtc/base/refcount.h"
 #include "webrtc/base/scoped_ref_ptr.h"
 #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"
 
 namespace cricket {
 
 struct CapturedFrame;
 
 class WebRtcVideoFrame : public VideoFrame {
  public:
   WebRtcVideoFrame();
 
   // Preferred construction, with microsecond timestamp.
@@ skipping 22 matching lines @@
             int64_t time_stamp_ns,
             webrtc::VideoRotation rotation);
 
   // The timestamp of the captured frame is expected to use the same
   // timescale and epoch as rtc::Time.
   // TODO(nisse): Consider adding a warning message, or even an RTC_DCHECK, if
   // the time is too far off.
   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;
 
   const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& video_frame_buffer()
       const override;
 
   /* System monotonic clock */
   int64_t timestamp_us() const override { return timestamp_us_; }
   void set_timestamp_us(int64_t time_us) override { timestamp_us_ = time_us; };
 
   webrtc::VideoRotation rotation() const override { return rotation_; }
 
   VideoFrame* Copy() const override;
 
   size_t ConvertToRgbBuffer(uint32_t to_fourcc,
                             uint8_t* buffer,
                             size_t size,
                             int stride_rgb) const override;
 
   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.
   // |dh| is destination height, like |dw|, but must be a positive number.
   // Returns whether the function succeeded or failed.
   bool Reset(uint32_t format,
              int w,
              int h,
              int dw,
              int dh,
              uint8_t* sample,
              size_t sample_size,
              int64_t timestamp_us,
              webrtc::VideoRotation rotation,
              bool apply_rotation);
 
  private:
-  // The test mutates |rotation_|, so it needs to be a friend.
-  FRIEND_TEST_ALL_PREFIXES(WebRtcVideoFrameTest, ApplyRotationToFrame);
+  VideoFrame* CreateEmptyFrame(int w, int h,
+                               int64_t time_stamp_ns) const override;
 
   // An opaque reference counted handle that stores the pixel data.
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer_;
   int64_t timestamp_us_;
   webrtc::VideoRotation rotation_;
 
   // This is mutable as the calculation is expensive but once calculated, it
   // remains const.
   mutable std::unique_ptr<VideoFrame> rotated_frame_;
 };
 
 }  // namespace cricket
 
 #endif  // WEBRTC_MEDIA_ENGINE_WEBRTCVIDEOFRAME_H_