Reland of Delete webrtc::VideoFrame methods buffer and stride.

webrtc/test/frame_generator_unittest.cc

Index: webrtc/test/frame_generator_unittest.cc
diff --git a/webrtc/test/frame_generator_unittest.cc b/webrtc/test/frame_generator_unittest.cc
index 10acd461652bfd9984989e167493e78656e20323..2cffdcaa8c3759d675d80b6f712b8d5a4f6349b6 100644
--- a/webrtc/test/frame_generator_unittest.cc
+++ b/webrtc/test/frame_generator_unittest.cc
@@ -59,17 +59,17 @@ class FrameGeneratorTest : public ::testing::Test {
   void CheckFrameAndMutate(VideoFrame* frame, uint8_t y, uint8_t u, uint8_t v) {
     // Check that frame is valid, has the correct color and timestamp are clean.
     ASSERT_NE(nullptr, frame);
-    uint8_t* buffer;
+    const uint8_t* buffer;
     ASSERT_EQ(y_size, frame->allocated_size(PlaneType::kYPlane));
-    buffer = frame->buffer(PlaneType::kYPlane);
+    buffer = frame->video_frame_buffer()->DataY();
     for (int i = 0; i < y_size; ++i)
       ASSERT_EQ(y, buffer[i]);
     ASSERT_EQ(uv_size, frame->allocated_size(PlaneType::kUPlane));
-    buffer = frame->buffer(PlaneType::kUPlane);
+    buffer = frame->video_frame_buffer()->DataU();
     for (int i = 0; i < uv_size; ++i)
       ASSERT_EQ(u, buffer[i]);
     ASSERT_EQ(uv_size, frame->allocated_size(PlaneType::kVPlane));
-    buffer = frame->buffer(PlaneType::kVPlane);
+    buffer = frame->video_frame_buffer()->DataV();
     for (int i = 0; i < uv_size; ++i)
       ASSERT_EQ(v, buffer[i]);
     EXPECT_EQ(0, frame->ntp_time_ms());