Rename UploadToVideoFrame to ConvertToVideoFrame.

chrome/gpu/gpu_video_decoder.h

 // Copyright (c) 2010 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.
 
 #ifndef CHROME_GPU_GPU_VIDEO_DECODER_H_
 #define CHROME_GPU_GPU_VIDEO_DECODER_H_
 
 #include <map>
 #include <vector>
 
@@ skipping 102 matching lines @@
   virtual void OnFormatChange(VideoStreamInfo stream_info);
   virtual void ProduceVideoSample(scoped_refptr<Buffer> buffer);
   virtual void ConsumeVideoFrame(scoped_refptr<VideoFrame> frame);
 
   // VideoDecodeContext implementation.
   virtual void* GetDevice();
   virtual void AllocateVideoFrames(
       int n, size_t width, size_t height, media::VideoFrame::Format format,
       std::vector<scoped_refptr<media::VideoFrame> >* frames, Task* task);
   virtual void ReleaseAllVideoFrames();
-  virtual void UploadToVideoFrame(void* buffer,
-                                  scoped_refptr<media::VideoFrame> frame,
-                                  Task* task);
+  virtual void ConvertToVideoFrame(void* buffer,
+                                   scoped_refptr<media::VideoFrame> frame,
+                                   Task* task);
   virtual void Destroy(Task* task);
 
   // These methods are used in unit test only.
   void SetVideoDecodeEngine(media::VideoDecodeEngine* engine);
   void SetGpuVideoDevice(GpuVideoDevice* device);
 
  private:
   struct PendingAllocation;
 
   int32 decoder_host_id() { return decoder_host_id_; }
@@ skipping 59 matching lines @@
   typedef std::map<int32, scoped_refptr<media::VideoFrame> > VideoFrameMap;
   VideoFrameMap video_frame_map_;
 
   media::VideoCodecConfig config_;
   media::VideoCodecInfo info_;
 
   DISALLOW_COPY_AND_ASSIGN(GpuVideoDecoder);
 };
 
 #endif  // CHROME_GPU_GPU_VIDEO_DECODER_H_