Revert r180578, r180591, and r180604 from 1410 branch.

media/base/mock_filters.h

Index: media/base/mock_filters.h
===================================================================
--- media/base/mock_filters.h	(revision 182591)
+++ media/base/mock_filters.h	(working copy)
@@ -134,7 +134,6 @@
 class MockVideoRenderer : public VideoRenderer {
  public:
   MockVideoRenderer();
-  virtual ~MockVideoRenderer();
 
   // VideoRenderer implementation.
   MOCK_METHOD10(Initialize, void(const scoped_refptr<DemuxerStream>& stream,
@@ -154,6 +153,9 @@
   MOCK_METHOD1(Stop, void(const base::Closure& callback));
   MOCK_METHOD1(SetPlaybackRate, void(float playback_rate));
 
+ protected:
+  virtual ~MockVideoRenderer();
+
  private:
   DISALLOW_COPY_AND_ASSIGN(MockVideoRenderer);
 };
@@ -161,7 +163,6 @@
 class MockAudioRenderer : public AudioRenderer {
  public:
   MockAudioRenderer();
-  virtual ~MockAudioRenderer();
 
   // AudioRenderer implementation.
   MOCK_METHOD9(Initialize, void(const scoped_refptr<DemuxerStream>& stream,
@@ -182,6 +183,9 @@
   MOCK_METHOD1(SetVolume, void(float volume));
   MOCK_METHOD1(ResumeAfterUnderflow, void(bool buffer_more_audio));
 
+ protected:
+  virtual ~MockAudioRenderer();
+
  private:
   DISALLOW_COPY_AND_ASSIGN(MockAudioRenderer);
 };