Make cricket::VideoFrame inherit webrtc::VideoFrame.

webrtc/video_frame.h

 /*
  *  Copyright (c) 2014 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_VIDEO_FRAME_H_
 #define WEBRTC_VIDEO_FRAME_H_
 
 #include "webrtc/base/scoped_ref_ptr.h"
 #include "webrtc/base/timeutils.h"
 #include "webrtc/common_types.h"
 #include "webrtc/common_video/include/video_frame_buffer.h"
 #include "webrtc/common_video/rotation.h"
 #include "webrtc/typedefs.h"
 
+namespace cricket {
+class WebRtcVideoFrameTest;
+}  // namespace cricket
+
 namespace webrtc {
 
 // TODO(nisse): This class duplicates cricket::VideoFrame. There's
 // ongoing work to merge the classes. See
 // https://bugs.chromium.org/p/webrtc/issues/detail?id=5682.
 class VideoFrame {
  public:
   // TODO(nisse): Deprecated. Using the default constructor violates the
   // reasonable assumption that video_frame_buffer() returns a valid buffer.
   VideoFrame();
@@ skipping 147 matching lines @@
   const rtc::scoped_refptr<webrtc::VideoFrameBuffer>& video_frame_buffer()
       const;
 
   // Return true if the frame is stored in a texture.
   bool is_texture() {
     return video_frame_buffer() &&
            video_frame_buffer()->native_handle() != nullptr;
   }
 
  private:
+  // Tests mutate |rotation_|, so the base test class is a friend.
+  friend class cricket::WebRtcVideoFrameTest;

[pthatcher1, 2016/09/07 18:11:39]

A reference to a unit test class?  That seems terrible.  Why don't we just add
some kind of set_rotation method?

[nisse-webrtc, 2016/09/08 11:07:13]

No longer needed, since this cl also deletes those tests. Deleted.

For background, this friend declaration can be found in  in webrtcvideoframe.h
on master. WebRtcVideoFrame used to have a set_rotation method, used only by
tests. It was removed by sergeyu and replaced by this friend declaration, in cl
https://codereview.webrtc.org/2075983003/

+
   // An opaque reference counted handle that stores the pixel data.
   rtc::scoped_refptr<webrtc::VideoFrameBuffer> video_frame_buffer_;
   uint32_t timestamp_rtp_;
   int64_t ntp_time_ms_;
   int64_t timestamp_us_;
   VideoRotation rotation_;
 };
 
 
 // TODO(pbos): Rename EncodedFrame and reformat this class' members.
@@ skipping 38 matching lines @@
   int qp_ = -1;  // Quantizer value.
 
   // When an application indicates non-zero values here, it is taken as an
   // indication that all future frames will be constrained with those limits
   // until the application indicates a change again.
   PlayoutDelay playout_delay_ = {-1, -1};
 };
 
 }  // namespace webrtc
 #endif  // WEBRTC_VIDEO_FRAME_H_