Revert everything related to the relanding.

media/filters/video_renderer_base.h

 // 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.
 
 // VideoRendererBase creates its own thread for the sole purpose of timing frame
 // presentation.  It handles reading from the decoder and stores the results in
 // a queue of decoded frames, calling OnFrameAvailable() on subclasses to notify
 // when a frame is ready to display.
 //
 // The media filter methods Initialize(), Stop(), SetPlaybackRate() and Seek()
 // should be serialized, which they commonly are the pipeline thread.
 // As long as VideoRendererBase is initialized, GetCurrentFrame() is safe to
 // call from any thread, at any time, including inside of OnFrameAvailable().
 
 #ifndef MEDIA_FILTERS_VIDEO_RENDERER_BASE_H_
 #define MEDIA_FILTERS_VIDEO_RENDERER_BASE_H_
 
 #include <deque>
 
 #include "base/condition_variable.h"
 #include "base/lock.h"
-#include "base/scoped_ptr.h"
 #include "media/base/filters.h"
 #include "media/base/video_frame.h"
 
 namespace media {
 
 // TODO(scherkus): to avoid subclasses, consider using a peer/delegate interface
 // and pass in a reference to the constructor.
 class VideoRendererBase : public VideoRenderer,
                           public PlatformThread::Delegate {
  public:
@@ skipping 136 matching lines @@
   // Filter callbacks.
   scoped_ptr<FilterCallback> pause_callback_;
   scoped_ptr<FilterCallback> seek_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoRendererBase);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_FILTERS_VIDEO_RENDERER_BASE_H_