3 files changed, 5 insertions, 5 deletions
diff --git a/media/video/mft_h264_decode_engine.cc b/media/video/mft_h264_decode_engine.cc
index 9a5bdb0..5166b1f 100644
--- a/media/video/mft_h264_decode_engine.cc
+++ b/media/video/mft_h264_decode_engine.cc
@@ -650,7 +650,7 @@ bool MftH264DecodeEngine::DoDecode() {
     // TODO(imcheng): Detect error.
     output_frames_[0]->SetTimestamp(TimeDelta::FromMicroseconds(timestamp));
     output_frames_[0]->SetDuration(TimeDelta::FromMicroseconds(duration));
-    context_->UploadToVideoFrame(
+    context_->ConvertToVideoFrame(
         surface.get(), output_frames_[0],
         NewRunnableMethod(this, &MftH264DecodeEngine::OnUploadVideoFrameDone,
                           surface, output_frames_[0]));
diff --git a/media/video/mock_objects.h b/media/video/mock_objects.h
index 24cd4d3..c0f3dd9 100644
--- a/media/video/mock_objects.h
+++ b/media/video/mock_objects.h
@@ -41,7 +41,7 @@ class MockVideoDecodeContext : public VideoDecodeContext {
       std::vector<scoped_refptr<VideoFrame> >* frames,
       Task* task));
   MOCK_METHOD0(ReleaseAllVideoFrames, void());
-  MOCK_METHOD3(UploadToVideoFrame,  void(
+  MOCK_METHOD3(ConvertToVideoFrame,  void(
       void* buffer, scoped_refptr<VideoFrame> frame, Task* task));
   MOCK_METHOD1(Destroy, void(Task* task));
 
diff --git a/media/video/video_decode_context.h b/media/video/video_decode_context.h
index 7bd6741..55740f7 100644
--- a/media/video/video_decode_context.h
+++ b/media/video/video_decode_context.h
@@ -67,9 +67,9 @@ class VideoDecodeContext {
   // Implementor should know how to handle it.
   //
   // |task| is executed if the operation was completed successfully.
-  // TODO(hclam): Rename this to ConvertToVideoFrame().
-  virtual void UploadToVideoFrame(void* buffer, scoped_refptr<VideoFrame> frame,
-                                  Task* task) = 0;
+  virtual void ConvertToVideoFrame(void* buffer,
+                                   scoped_refptr<VideoFrame> frame,
+                                   Task* task) = 0;
 
   // Destroy this context asynchronously. When the operation is done |task|
   // is called. It is safe to delete this object only after |task| is called.