Add AudioStreamRegistry. Move stream counting logic

content/browser/renderer_host/media/audio_renderer_host.h

Index: content/browser/renderer_host/media/audio_renderer_host.h
diff --git a/content/browser/renderer_host/media/audio_renderer_host.h b/content/browser/renderer_host/media/audio_renderer_host.h
index ad03140fb07232ec6e57edbc6761167d774cad9b..ecc4cee6ab8e24bc1a396b08037f1c415552f882 100644
--- a/content/browser/renderer_host/media/audio_renderer_host.h
+++ b/content/browser/renderer_host/media/audio_renderer_host.h
@@ -65,6 +65,7 @@ class AudioParameters;
 namespace content {
 
 class AudioMirroringManager;
+class AudioStreamRegistry;
 class MediaStreamManager;
 
 class CONTENT_EXPORT AudioRendererHost
@@ -73,6 +74,7 @@ class CONTENT_EXPORT AudioRendererHost
  public:
   // Called from UI thread from the owner of this object.
   AudioRendererHost(int render_process_id,
+                    AudioStreamRegistry* stream_registry,
                     media::AudioManager* audio_manager,
                     AudioMirroringManager* mirroring_manager,
                     MediaStreamManager* media_stream_manager,
@@ -95,10 +97,6 @@ class CONTENT_EXPORT AudioRendererHost
   void OnStreamError(int stream_id) override;
   void OnStreamStateChanged(bool is_playing) override;
 
-  // Returns true if any streams managed by this host are actively playing.  Can
-  // be called from any thread.
-  bool HasActiveAudio();
-
   void OverrideDevicePermissionsForTesting(bool has_access);
 
  private:
@@ -177,10 +175,6 @@ class CONTENT_EXPORT AudioRendererHost
   // validated. When |is_valid| is false, this calls OnStreamError().
   void DidValidateRenderFrame(int stream_id, bool is_valid);
 
-  // Updates status of stream for AudioStreamMonitor and updates
-  // the number of playing streams.
-  void StreamStateChanged(int stream_id, bool is_playing);
-
   RenderProcessHost::AudioOutputControllerList DoGetOutputControllers() const;
 
   // Send an error message to the renderer.
@@ -206,6 +200,7 @@ class CONTENT_EXPORT AudioRendererHost
   // ID of the RenderProcessHost that owns this instance.
   const int render_process_id_;
 
+  AudioStreamRegistry* const stream_registry_;
   media::AudioManager* const audio_manager_;
   AudioMirroringManager* const mirroring_manager_;
 
@@ -215,10 +210,6 @@ class CONTENT_EXPORT AudioRendererHost
   // A list of the current open streams.
   AudioOutputDelegateVector delegates_;
 
-  // The number of streams in the playing state. Atomic read safe from any
-  // thread, but should only be updated from the IO thread.
-  base::AtomicRefCount num_playing_streams_;
-
   // Salt required to translate renderer device IDs to raw device unique IDs
   std::string salt_;
 
@@ -233,10 +224,6 @@ class CONTENT_EXPORT AudioRendererHost
   // constructor, but this can be overridden by unit tests.
   ValidateRenderFrameIdFunction validate_render_frame_id_function_;
 
-  // The maximum number of simultaneous streams during the lifetime of this
-  // host. Reported as UMA stat at shutdown.
-  size_t max_simultaneous_streams_;
-
   AudioOutputAuthorizationHandler authorization_handler_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioRendererHost);