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

media/tools/shader_bench/gpu_color_painter.cc

Index: media/tools/shader_bench/gpu_color_painter.cc
diff --git a/media/tools/shader_bench/gpu_color_painter.cc b/media/tools/shader_bench/gpu_color_painter.cc
index 2c81d2b80f1f183e5fbf7ac296c13f565f300949..a408de2013ddb92afdcfa28d16f923dccd3dce7d 100644
--- a/media/tools/shader_bench/gpu_color_painter.cc
+++ b/media/tools/shader_bench/gpu_color_painter.cc
@@ -104,13 +104,15 @@ void GPUColorWithLuminancePainter::Initialize(int width, int height) {
 
 void GPUColorWithLuminancePainter::Paint(
     scoped_refptr<media::VideoFrame> video_frame) {
+  int width = video_frame->data_size().width();
+  int height = video_frame->data_size().height();
   for (unsigned int i = 0; i < kNumYUVPlanes; ++i) {
-    unsigned int width = (i == media::VideoFrame::kYPlane) ?
-        video_frame->width() : video_frame->width() / 2;
-    unsigned int height = (i == media::VideoFrame::kYPlane) ?
-        video_frame->height() : video_frame->height() / 2;
+    unsigned int plane_width =
+        (i == media::VideoFrame::kYPlane) ? width : width / 2;
+    unsigned int plane_height =
+        (i == media::VideoFrame::kYPlane) ? height : height / 2;
     glBindTexture(GL_TEXTURE_2D, textures_[i]);
-    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, width, height,
+    glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, plane_width, plane_height,
                     GL_LUMINANCE, GL_UNSIGNED_BYTE, video_frame->data(i));
   }