| Index: content/shell/renderer/layout_test/test_video_frame_provider.cc
 | 
| diff --git a/content/shell/renderer/layout_test/test_video_frame_provider.cc b/content/shell/renderer/layout_test/test_video_frame_provider.cc
 | 
| index 97ecb02e361ec8a5bb5c69116de8db5c2d1e6f72..09895728942343307d1230e35acf1292c2e5e8d8 100644
 | 
| --- a/content/shell/renderer/layout_test/test_video_frame_provider.cc
 | 
| +++ b/content/shell/renderer/layout_test/test_video_frame_provider.cc
 | 
| @@ -6,8 +6,7 @@
 | 
|  
 | 
|  #include "base/bind.h"
 | 
|  #include "base/location.h"
 | 
| -#include "base/single_thread_task_runner.h"
 | 
| -#include "base/thread_task_runner_handle.h"
 | 
| +#include "base/message_loop/message_loop_proxy.h"
 | 
|  #include "media/base/video_frame.h"
 | 
|  
 | 
|  namespace content {
 | 
| @@ -17,7 +16,7 @@ TestVideoFrameProvider::TestVideoFrameProvider(
 | 
|      const base::TimeDelta& frame_duration,
 | 
|      const base::Closure& error_cb,
 | 
|      const VideoFrameProvider::RepaintCB& repaint_cb)
 | 
| -    : task_runner_(base::ThreadTaskRunnerHandle::Get()),
 | 
| +    : message_loop_proxy_(base::MessageLoopProxy::current()),
 | 
|        size_(size),
 | 
|        state_(kStopped),
 | 
|        frame_duration_(frame_duration),
 | 
| @@ -29,35 +28,36 @@ TestVideoFrameProvider::~TestVideoFrameProvider() {}
 | 
|  
 | 
|  void TestVideoFrameProvider::Start() {
 | 
|    DVLOG(1) << "TestVideoFrameProvider::Start";
 | 
| -  DCHECK(task_runner_->BelongsToCurrentThread());
 | 
| +  DCHECK(message_loop_proxy_->BelongsToCurrentThread());
 | 
|    state_ = kStarted;
 | 
| -  task_runner_->PostTask(
 | 
| -      FROM_HERE, base::Bind(&TestVideoFrameProvider::GenerateFrame, this));
 | 
| +  message_loop_proxy_->PostTask(
 | 
| +      FROM_HERE,
 | 
| +      base::Bind(&TestVideoFrameProvider::GenerateFrame, this));
 | 
|  }
 | 
|  
 | 
|  void TestVideoFrameProvider::Stop() {
 | 
|    DVLOG(1) << "TestVideoFrameProvider::Stop";
 | 
| -  DCHECK(task_runner_->BelongsToCurrentThread());
 | 
| +  DCHECK(message_loop_proxy_->BelongsToCurrentThread());
 | 
|    state_ = kStopped;
 | 
|  }
 | 
|  
 | 
|  void TestVideoFrameProvider::Play() {
 | 
|    DVLOG(1) << "TestVideoFrameProvider::Play";
 | 
| -  DCHECK(task_runner_->BelongsToCurrentThread());
 | 
| +  DCHECK(message_loop_proxy_->BelongsToCurrentThread());
 | 
|    if (state_ == kPaused)
 | 
|      state_ = kStarted;
 | 
|  }
 | 
|  
 | 
|  void TestVideoFrameProvider::Pause() {
 | 
|    DVLOG(1) << "TestVideoFrameProvider::Pause";
 | 
| -  DCHECK(task_runner_->BelongsToCurrentThread());
 | 
| +  DCHECK(message_loop_proxy_->BelongsToCurrentThread());
 | 
|    if (state_ == kStarted)
 | 
|      state_ = kPaused;
 | 
|  }
 | 
|  
 | 
|  void TestVideoFrameProvider::GenerateFrame() {
 | 
|    DVLOG(1) << "TestVideoFrameProvider::GenerateFrame";
 | 
| -  DCHECK(task_runner_->BelongsToCurrentThread());
 | 
| +  DCHECK(message_loop_proxy_->BelongsToCurrentThread());
 | 
|    if (state_ == kStopped)
 | 
|      return;
 | 
|  
 | 
| @@ -74,8 +74,9 @@ void TestVideoFrameProvider::GenerateFrame() {
 | 
|    }
 | 
|  
 | 
|    current_time_ += frame_duration_;
 | 
| -  task_runner_->PostDelayedTask(
 | 
| -      FROM_HERE, base::Bind(&TestVideoFrameProvider::GenerateFrame, this),
 | 
| +  message_loop_proxy_->PostDelayedTask(
 | 
| +      FROM_HERE,
 | 
| +      base::Bind(&TestVideoFrameProvider::GenerateFrame, this),
 | 
|        frame_duration_);
 | 
|  }
 | 
|  
 | 
| 
 |