Makes AudioOutputDispatcher non-ref-counted.

media/audio/audio_output_dispatcher_impl.cc

 // 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.
 
 #include "media/audio/audio_output_dispatcher_impl.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/compiler_specific.h"
@@ skipping 14 matching lines @@
       idle_proxies_(0),
       close_timer_(FROM_HERE,
                    close_delay,
                    this,
                    &AudioOutputDispatcherImpl::CloseAllIdleStreams),
       audio_log_(
           audio_manager->CreateAudioLog(AudioLogFactory::AUDIO_OUTPUT_STREAM)),
       audio_stream_id_(0) {}
 
 AudioOutputDispatcherImpl::~AudioOutputDispatcherImpl() {
+  CHECK(task_runner_->BelongsToCurrentThread());
+
+  // Close all idle streams immediately.  The |close_timer_| will handle
+  // invalidating any outstanding tasks upon its destruction.
+  CloseAllIdleStreams();
+
   // There must be no idle proxy streams.
   CHECK_EQ(idle_proxies_, 0u);
 
   // There must be no active proxy streams.
   CHECK(proxy_to_physical_map_.empty());

[DaleCurtis, 2016/12/13 20:27:55]

Probably this will cause the CHECK() failures we're seeing to move to here.

[alokp, 2016/12/13 20:29:32]

Yes

 
   // All idle physical streams must have been closed during shutdown.
   CHECK(idle_streams_.empty());
 }
 
 bool AudioOutputDispatcherImpl::OpenStream() {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   // Ensure that there is at least one open stream.
   if (idle_streams_.empty() && !CreateAndOpenStream())
@@ skipping 65 matching lines @@
 
   DCHECK_GT(idle_proxies_, 0u);
   --idle_proxies_;
 
   // Leave at least a single stream running until the close timer fires to help
   // cycle time when streams are opened and closed repeatedly.
   CloseIdleStreams(std::max(idle_proxies_, static_cast<size_t>(1)));
   close_timer_.Reset();
 }
 
-void AudioOutputDispatcherImpl::Shutdown() {
-  DCHECK(task_runner_->BelongsToCurrentThread());
-
-  // Close all idle streams immediately.  The |close_timer_| will handle
-  // invalidating any outstanding tasks upon its destruction.
-  CloseAllIdleStreams();
-
-  // No AudioOutputProxy objects should hold a reference to us when we get
-  // to this stage.
-  DCHECK(HasOneRef()) << "Only the AudioManager should hold a reference";
-
-  LOG_IF(WARNING, idle_proxies_ > 0u) << "Idle proxy streams during shutdown: "
-                                      << idle_proxies_;
-  LOG_IF(WARNING, !proxy_to_physical_map_.empty())
-      << "Active proxy streams during shutdown: "
-      << proxy_to_physical_map_.size();
-}
-
 bool AudioOutputDispatcherImpl::HasOutputProxies() const {
   return idle_proxies_ || !proxy_to_physical_map_.empty();
 }
 
 bool AudioOutputDispatcherImpl::CreateAndOpenStream() {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   const int stream_id = audio_stream_id_++;
   AudioOutputStream* stream = audio_manager_->MakeAudioOutputStream(
       params_, device_id_,
@@ skipping 30 matching lines @@
 
     AudioStreamIDMap::iterator it = audio_stream_ids_.find(stream);
     DCHECK(it != audio_stream_ids_.end());
     audio_log_->OnClosed(it->second);
     audio_stream_ids_.erase(it);
   }
   idle_streams_.erase(idle_streams_.begin() + keep_alive, idle_streams_.end());
 }
 
 }  // namespace media