Move InitToBlack and Reset methods from cricket::VideoFrame to its subclass cricket::WebRtcVideoFra…

webrtc/media/base/videoframe_unittest.h

 /*
  *  Copyright (c) 2004 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.
  */
 
@@ skipping 1354 matching lines @@
         EXPECT_TRUE(ConvertRgb(ms.get(), cricket::FOURCC_ARGB,
                                kOddWidth + i, kOddHeight + j,
                                &frame1));
         EXPECT_TRUE(LoadFrame(ms.get(), cricket::FOURCC_ARGB,
                               kOddWidth + i, kOddHeight + j, &frame2));
         EXPECT_TRUE(IsEqual(frame1, frame2, 64));
       }
     }
   }
 
+  // TODO(nisse): Reset is no longer a public method, and not

[perkj_webrtc, 2016/03/24 09:53:00]

Take a look and advice please. 
You can probably make an init test out of this.

[nisse-webrtc, 2016/03/24 10:03:14]

Only problem is that the Init-method to test takes a CapturedFrame as input. I
can do that, question is if it is needed, or if we have other tests calling
Init(CapturedFrame, ... ) with various values of rotation and apply_rotation.

+  // available here. It is used by the two Init methods. Do we have
+  // adequate tests form WebRtcVideoFrame::Init?
+#if 0
   // Tests re-initing an existing image.
   void Reset(webrtc::VideoRotation rotation, bool apply_rotation) {
     T frame1, frame2;
     std::unique_ptr<rtc::MemoryStream> ms(
         LoadSample(kImageFilename));
     ASSERT_TRUE(ms.get() != NULL);
     size_t data_size;
     ms->GetSize(&data_size);
     EXPECT_TRUE(frame1.InitToBlack(kWidth, kHeight, 0));
     EXPECT_TRUE(frame2.InitToBlack(kWidth, kHeight, 0));
@@ skipping 21 matching lines @@
     EXPECT_FALSE(IsEqual(frame1, frame2, 0));
   }
 
   void ResetAndApplyRotation() {
     Reset(webrtc::kVideoRotation_90, true);
   }
 
   void ResetAndDontApplyRotation() {
     Reset(webrtc::kVideoRotation_90, false);
   }
+#endif
 
   //////////////////////
   // Conversion tests //
   //////////////////////
 
   enum ToFrom { TO, FROM };
 
   // Helper function for test converting from I420 to packed formats.
   inline void ConvertToBuffer(int bpp,
                               int rowpad,
@@ skipping 432 matching lines @@
     ASSERT_TRUE(LoadFrameNoRepeat(&target2));
     source.StretchToFrame(&target2, true, true);
     EXPECT_TRUE(IsBlack(target2));
     EXPECT_EQ(source.GetTimeStamp(), target2.GetTimeStamp());
   }
 
   int repeat_;
 };
 
 #endif  // WEBRTC_MEDIA_BASE_VIDEOFRAME_UNITTEST_H_