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

media/tools/shader_bench/shader_bench.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include <stdio.h>
 #include <stdlib.h>
 #include <deque>
 #include <ostream>
 
 #include "base/at_exit.h"
@@ skipping 32 matching lines @@
                int width, int height, int num_frames,
                std::deque<scoped_refptr<media::VideoFrame> >& out_frames) {
   FILE* file_handle = fopen(file_name.c_str(), "rb");
   if (!file_handle) {
     printf("Could not open %s\n", file_name.c_str());
     exit(1);
   }
 
   long frame_size = CalculateYUVFrameSize(file_handle, num_frames);
 
+  gfx::Size size(width, height);
   for (int i = 0; i < num_frames; i++) {
     scoped_refptr<media::VideoFrame> video_frame =
-        media::VideoFrame::CreateFrame(media::VideoFrame::YV12,
-                                       width,
-                                       height,
+        media::VideoFrame::CreateFrame(media::VideoFrame::YV12, size, size,
                                        base::TimeDelta());
     long bytes_read =
         fread(video_frame->data(0), 1, frame_size, file_handle);
 
     if (bytes_read != frame_size) {
       printf("Could not read %s\n", file_name.c_str());
       fclose(file_handle);
       exit(1);
     }
     out_frames.push_back(video_frame);
@@ skipping 86 matching lines @@
     scoped_ptr<GPUPainter> painter(painters[i].painter);
     painter->LoadFrames(&frames);
     painter->SetGLContext(surface, context);
     painter->Initialize(width, height);
     printf("Running %s tests...", painters[i].name);
     RunTest(window.get(), painter.get());
   }
 
   return 0;
 }