Remove VideoDecoder::natural_size() & added VideoFrame::natural_size().

media/tools/shader_bench/cpu_color_painter.cc

Index: media/tools/shader_bench/cpu_color_painter.cc
diff --git a/media/tools/shader_bench/cpu_color_painter.cc b/media/tools/shader_bench/cpu_color_painter.cc
index 95314d095f2a5c561cbcbafd325c9ff6e1be1123..b99b803a284717b517a1cefb3c251f9cbeeaf438 100644
--- a/media/tools/shader_bench/cpu_color_painter.cc
+++ b/media/tools/shader_bench/cpu_color_painter.cc
@@ -67,24 +67,24 @@ void CPUColorPainter::Paint(scoped_refptr<media::VideoFrame> video_frame) {
   // Convert to RGB32 frame.
   scoped_refptr<media::VideoFrame> rgba_frame =
       media::VideoFrame::CreateFrame(media::VideoFrame::RGB32,
-                                     video_frame->width(),
-                                     video_frame->height(),
+                                     video_frame->data_size(),
+                                     video_frame->natural_size(),
                                      base::TimeDelta());
 
   media::ConvertYUVToRGB32(video_frame->data(media::VideoFrame::kYPlane),
                            video_frame->data(media::VideoFrame::kUPlane),
                            video_frame->data(media::VideoFrame::kVPlane),
                            rgba_frame->data(0),
-                           video_frame->width(),
-                           video_frame->height(),
+                           video_frame->data_size().width(),
+                           video_frame->data_size().height(),
                            video_frame->stride(media::VideoFrame::kYPlane),
                            video_frame->stride(media::VideoFrame::kUPlane),
                            rgba_frame->stride(0),
                            media::YV12);
 
   glBindTexture(GL_TEXTURE_2D, textures_[0]);
-  glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, rgba_frame->width(),
-                  rgba_frame->height(), GL_RGBA, GL_UNSIGNED_BYTE,
+  glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, rgba_frame->data_size().width(),
+                  rgba_frame->data_size().height(), GL_RGBA, GL_UNSIGNED_BYTE,
                   rgba_frame->data(0));
 
   glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);