--- a/content/media/AudioStream.cpp
+++ b/content/media/AudioStream.cpp
@@ -218,21 +218,20 @@ void AudioStream::ShutdownLibrary()
 AudioStream::~AudioStream()
 {
 }
 
 bool AudioStream::EnsureTimeStretcherInitialized()
 {
   if (mTimeStretcher)
     return true;
-  soundtouch::SoundTouch* state = new soundtouch::SoundTouch();
-  if (!state) {
+  mTimeStretcher = new soundtouch::SoundTouch();
+  if (!mTimeStretcher) {
     return false;
   }
-  mTimeStretcher.own(state);
   mTimeStretcher->setSampleRate(mInRate);
   mTimeStretcher->setChannels(mChannels);
   mTimeStretcher->setPitch(1.0);
   return true;
 }
 
 nsresult AudioStream::SetPlaybackRate(double aPlaybackRate)
 {

--- a/content/media/AudioStream.h
+++ b/content/media/AudioStream.h
@@ -5,28 +5,17 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 #if !defined(AudioStream_h_)
 #define AudioStream_h_
 
 #include "nscore.h"
 #include "AudioSampleFormat.h"
 #include "AudioChannelCommon.h"
 #include "soundtouch/SoundTouch.h"
-#include "nsAutoRef.h"
-
-
-template <>
-class nsAutoRefTraits<soundtouch::SoundTouch> : public nsPointerRefTraits<soundtouch::SoundTouch>
-{
-public:
-  static void Release(soundtouch::SoundTouch* resamplerState) {
-    delete resamplerState;
-    resamplerState = nullptr;
-  }
-};
+#include "nsAutoPtr.h"
 
 namespace mozilla {
 
 class AudioStream;
 
 class AudioClock
 {
   public:
@@ -181,14 +170,14 @@ public:
 
 protected:
   // Input rate in Hz (characteristic of the media being played)
   int mInRate;
   // Output rate in Hz (characteristic of the playback rate)
   int mOutRate;
   int mChannels;
   AudioClock mAudioClock;
-  nsAutoRef<soundtouch::SoundTouch> mTimeStretcher;
+  nsAutoPtr<soundtouch::SoundTouch> mTimeStretcher;
 };
 
 } // namespace mozilla
 
 #endif