Rename UploadToVideoFrame to ConvertToVideoFrame.

chrome/gpu/gpu_video_decoder.cc

 // 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.
 
 #include "chrome/gpu/gpu_video_decoder.h"
 
 #include "base/command_line.h"
 #include "chrome/common/child_thread.h"
 #include "chrome/common/gpu_messages.h"
 #include "chrome/gpu/gpu_channel.h"
@@ skipping 181 matching lines @@
   DCHECK(ret) << "Failed to switch context";
 
   for (VideoFrameMap::iterator i = video_frame_map_.begin();
        i != video_frame_map_.end(); ++i) {
     video_device_->ReleaseVideoFrame(i->second);
   }
   video_frame_map_.clear();
   SendReleaseAllVideoFrames();
 }
 
-void GpuVideoDecoder::UploadToVideoFrame(void* buffer,
-                                         scoped_refptr<media::VideoFrame> frame,
-                                         Task* task) {
+void GpuVideoDecoder::ConvertToVideoFrame(
+    void* buffer,
+    scoped_refptr<media::VideoFrame> frame,
+    Task* task) {
   // This method is called by VideoDecodeEngine to upload a buffer to a
   // VideoFrame. We should just delegate this to GpuVideoDevice which contains
   // the actual implementation.
   bool ret = gles2_decoder_->MakeCurrent();
   DCHECK(ret) << "Failed to switch context";
 
   // Actually doing the upload on the main thread.
-  ret = video_device_->UploadToVideoFrame(buffer, frame);
+  ret = video_device_->ConvertToVideoFrame(buffer, frame);
   DCHECK(ret) << "Failed to upload video content to a VideoFrame.";
   task->Run();
   delete task;
 }
 
 void GpuVideoDecoder::Destroy(Task* task) {
   //  TODO(hclam): I still need to think what I should do here.
 }
 
 void GpuVideoDecoder::SetVideoDecodeEngine(media::VideoDecodeEngine* engine) {
@@ skipping 181 matching lines @@
   }
 }
 
 void GpuVideoDecoder::SendReleaseAllVideoFrames() {
   if (!sender_->Send(
           new GpuVideoDecoderHostMsg_ReleaseAllVideoFrames(
               decoder_host_id()))) {
     LOG(ERROR) << "GpuVideoDecoderMsg_ReleaseAllVideoFrames failed";
   }
 }