| Index: media/filters/ffmpeg_video_decoder.cc | 
| diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc | 
| index a269afbfdf335a17e512e8a51c978cf57c38bb64..77ca41ee682a3fb69d6bd9a3e764a3f1d5d9f672 100644 | 
| --- a/media/filters/ffmpeg_video_decoder.cc | 
| +++ b/media/filters/ffmpeg_video_decoder.cc | 
| @@ -8,12 +8,12 @@ | 
| #include <string> | 
|  | 
| #include "base/bind.h" | 
| +#include "base/bind_to_current_loop.h" | 
| #include "base/callback_helpers.h" | 
| #include "base/command_line.h" | 
| #include "base/location.h" | 
| #include "base/single_thread_task_runner.h" | 
| #include "base/strings/string_number_conversions.h" | 
| -#include "media/base/bind_to_current_loop.h" | 
| #include "media/base/decoder_buffer.h" | 
| #include "media/base/limits.h" | 
| #include "media/base/media_switches.h" | 
| @@ -170,14 +170,14 @@ void FFmpegVideoDecoder::Initialize(const VideoDecoderConfig& config, | 
| FFmpegGlue::InitializeFFmpeg(); | 
|  | 
| config_ = config; | 
| -  PipelineStatusCB initialize_cb = BindToCurrentLoop(status_cb); | 
| +  PipelineStatusCB initialize_cb = base::BindToCurrentLoop(status_cb); | 
|  | 
| if (!config.IsValidConfig() || !ConfigureDecoder(low_delay)) { | 
| initialize_cb.Run(DECODER_ERROR_NOT_SUPPORTED); | 
| return; | 
| } | 
|  | 
| -  output_cb_ = BindToCurrentLoop(output_cb); | 
| +  output_cb_ = base::BindToCurrentLoop(output_cb); | 
|  | 
| // Success! | 
| state_ = kNormal; | 
| @@ -191,7 +191,7 @@ void FFmpegVideoDecoder::Decode(const scoped_refptr<DecoderBuffer>& buffer, | 
| DCHECK(!decode_cb.is_null()); | 
| CHECK_NE(state_, kUninitialized); | 
|  | 
| -  DecodeCB decode_cb_bound = BindToCurrentLoop(decode_cb); | 
| +  DecodeCB decode_cb_bound = base::BindToCurrentLoop(decode_cb); | 
|  | 
| if (state_ == kError) { | 
| decode_cb_bound.Run(kDecodeError); | 
|  |