6 files changed, 2 insertions, 32 deletions
diff --git a/media/base/mock_filters.h b/media/base/mock_filters.h
index ee4513f..ee3498a 100644
--- a/media/base/mock_filters.h
+++ b/media/base/mock_filters.h
@@ -153,7 +153,6 @@ class MockVideoRenderer : public VideoRenderer {
   MOCK_METHOD2(Preroll, void(base::TimeDelta time, const PipelineStatusCB& cb));
   MOCK_METHOD1(Stop, void(const base::Closure& callback));
   MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
-  virtual void PrepareForShutdownHack() {}
 
  protected:
   virtual ~MockVideoRenderer();
diff --git a/media/base/pipeline.cc b/media/base/pipeline.cc
index c2f1f13..31ccf58 100644
--- a/media/base/pipeline.cc
+++ b/media/base/pipeline.cc
@@ -724,11 +724,6 @@ void Pipeline::StopTask(const base::Closure& stop_cb) {
     return;
   }
 
-  // TODO(scherkus): Remove after pipeline state machine refactoring has some
-  // time to bake http://crbug.com/110228
-  if (video_renderer_)
-    video_renderer_->PrepareForShutdownHack();
-
   SetState(kStopping);
   pending_callbacks_.reset();
   stop_cb_ = stop_cb;
diff --git a/media/base/pipeline.h b/media/base/pipeline.h
index e023e87..b90f4c4 100644
--- a/media/base/pipeline.h
+++ b/media/base/pipeline.h
@@ -452,16 +452,9 @@ class MEDIA_EXPORT Pipeline
   PipelineStatusCB error_cb_;
   BufferingStateCB buffering_state_cb_;
 
-  // Audio renderer reference used for setting the volume and determining
-  // when playback has finished.
+  // Renderer references used for setting the volume, playback rate, and
+  // determining when playback has finished.
   scoped_refptr<AudioRenderer> audio_renderer_;
-
-  // Video Renderer reference used for determining when playback has finished
-  // and for signalling imminent shutdown.
-  // The signalling imminent shutdown is a HACK necessary because
-  // WebMediaPlayerImpl::Destroy() holds the render thread loop hostage
-  // until PipelineImpl::Stop() calls its callback.
-  // http://crbug.com/110228 tracks removing this hack.
   scoped_refptr<VideoRenderer> video_renderer_;
 
   // Demuxer reference used for setting the preload value.
diff --git a/media/base/video_decoder.cc b/media/base/video_decoder.cc
index b5100b8..4c7c4b7 100644
--- a/media/base/video_decoder.cc
+++ b/media/base/video_decoder.cc
@@ -14,6 +14,4 @@ bool VideoDecoder::HasAlpha() const {
   return false;
 }
 
-void VideoDecoder::PrepareForShutdownHack() {}
-
 }  // namespace media
diff --git a/media/base/video_decoder.h b/media/base/video_decoder.h
index c8fd93d..b22b144 100644
--- a/media/base/video_decoder.h
+++ b/media/base/video_decoder.h
@@ -64,14 +64,6 @@ class MEDIA_EXPORT VideoDecoder
   // that return formats with an alpha channel.
   virtual bool HasAlpha() const;
 
-  // Prepare decoder for shutdown.  This is a HACK needed because
-  // PipelineImpl::Stop() goes through a Pause/Flush/Stop dance to all its
-  // filters, waiting for each state transition to complete before starting the
-  // next, but WebMediaPlayerImpl::Destroy() holds the renderer loop hostage for
-  // the duration.  Default implementation does nothing; derived decoders may
-  // override as needed.  http://crbug.com/110228 tracks removing this.
-  virtual void PrepareForShutdownHack();
-
  protected:
   friend class base::RefCountedThreadSafe<VideoDecoder>;
   virtual ~VideoDecoder();
diff --git a/media/base/video_renderer.h b/media/base/video_renderer.h
index 57e22bc..c19c8f9 100644
--- a/media/base/video_renderer.h
+++ b/media/base/video_renderer.h
@@ -91,13 +91,6 @@ class MEDIA_EXPORT VideoRenderer
   // Updates the current playback rate.
   virtual void SetPlaybackRate(float playback_rate) = 0;
 
-  // Prepare decoder for shutdown.  This is a HACK needed because
-  // PipelineImpl::Stop() goes through a Pause/Flush/Stop dance to all its
-  // filters, waiting for each state transition to complete before starting the
-  // next, but WebMediaPlayerImpl::Destroy() holds the renderer loop hostage for
-  // the duration. http://crbug.com/110228 tracks removing this.
-  virtual void PrepareForShutdownHack() = 0;
-
  protected:
   friend class base::RefCountedThreadSafe<VideoRenderer>;