Rename UploadToVideoFrame to ConvertToVideoFrame.

media/video/mft_h264_decode_engine.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 "media/video/mft_h264_decode_engine.h"
 
 #include <d3d9.h>
 #include <dxva2api.h>
 #include <initguid.h>
 #include <mfapi.h>
@@ skipping 632 matching lines @@
     hr = MFGetService(output_buffer, MR_BUFFER_SERVICE,
                       IID_PPV_ARGS(surface.Receive()));
     if (FAILED(hr)) {
       LOG(ERROR) << "Failed to get surface from buffer";
       return true;
     }
     // Since we only allocated 1 frame from context.
     // 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]));
     return true;
   }
   // TODO(hclam): Remove this branch.
   // Not DXVA.
   VideoFrame::CreateFrame(info_.stream_info.surface_format,
                           info_.stream_info.surface_width,
                           info_.stream_info.surface_height,
@@ skipping 21 matching lines @@
 void MftH264DecodeEngine::OnUploadVideoFrameDone(
     ScopedComPtr<IDirect3DSurface9, &IID_IDirect3DSurface9> surface,
     scoped_refptr<media::VideoFrame> frame) {
   // After this method is exited the reference to surface is released.
   event_handler_->ConsumeVideoFrame(frame);
 }
 
 }  // namespace media
 
 DISABLE_RUNNABLE_METHOD_REFCOUNT(media::MftH264DecodeEngine);