Makes AudioOutputProxy -> AudioOutputDispatcher reference weak.

media/audio/audio_output_resampler.h

 // Copyright (c) 2012 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.
 
 #ifndef MEDIA_AUDIO_AUDIO_OUTPUT_RESAMPLER_H_
 #define MEDIA_AUDIO_AUDIO_OUTPUT_RESAMPLER_H_
 
 #include <map>
 
 #include "base/macros.h"
@@ skipping 21 matching lines @@
 class MEDIA_EXPORT AudioOutputResampler : public AudioOutputDispatcher {
  public:
   AudioOutputResampler(AudioManager* audio_manager,
                        const AudioParameters& input_params,
                        const AudioParameters& output_params,
                        const std::string& output_device_id,
                        const base::TimeDelta& close_delay);
   ~AudioOutputResampler() override;
 
   // AudioOutputDispatcher interface.
+  AudioOutputProxy* CreateStreamProxy() override;
   bool OpenStream() override;
   bool StartStream(AudioOutputStream::AudioSourceCallback* callback,
                    AudioOutputProxy* stream_proxy) override;
   void StopStream(AudioOutputProxy* stream_proxy) override;
   void StreamVolumeSet(AudioOutputProxy* stream_proxy, double volume) override;
   void CloseStream(AudioOutputProxy* stream_proxy) override;
 
  private:
   // Converts low latency based output parameters into high latency
   // appropriate output parameters in error situations.
   void SetupFallbackParams();
 
   // Used to reinitialize |dispatcher_|.
   void Reinitialize();
 
   // Used to initialize |dispatcher_|.
   void Initialize();
 
   // Dispatcher to proxy all AudioOutputDispatcher calls too.
   std::unique_ptr<AudioOutputDispatcherImpl> dispatcher_;
 
   // Map of outstanding OnMoreDataConverter objects.  A new object is created
   // on every StartStream() call and destroyed on CloseStream().
-  typedef std::map<AudioOutputProxy*, OnMoreDataConverter*> CallbackMap;
+  typedef std::map<AudioOutputProxy*, std::unique_ptr<OnMoreDataConverter>>
+      CallbackMap;
   CallbackMap callbacks_;
 
   // Used by AudioOutputDispatcherImpl; kept so we can reinitialize on the fly.
   base::TimeDelta close_delay_;
 
   // AudioParameters used to setup the output stream; changed upon fallback.
   AudioParameters output_params_;
 
   // The original AudioParameters we were constructed with.
   const AudioParameters original_output_params_;
 
   // Whether any streams have been opened through |dispatcher_|, if so we can't
   // fallback on future OpenStream() failures.
   bool streams_opened_;
 
   // The reinitialization timer provides a way to recover from temporary failure
   // states by clearing the dispatcher if all proxies have been closed and none
   // have been created within |close_delay_|.  Without this, audio may be lost
   // to a fake stream indefinitely for transient errors.
   base::Timer reinitialize_timer_;
 
+  base::WeakPtrFactory<AudioOutputResampler> weak_factory_;
   DISALLOW_COPY_AND_ASSIGN(AudioOutputResampler);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_OUTPUT_RESAMPLER_H_