Reland 153623004: Remove the unified IO code on the browser

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"
 #include "base/single_thread_task_runner.h"
 #include "base/time/time.h"
 #include "media/audio/audio_io.h"
 #include "media/audio/audio_output_proxy.h"
 
 namespace media {
 
 AudioOutputDispatcherImpl::AudioOutputDispatcherImpl(
     AudioManager* audio_manager,
     const AudioParameters& params,
     const std::string& output_device_id,
-    const std::string& input_device_id,
     const base::TimeDelta& close_delay)
     : AudioOutputDispatcher(audio_manager,
                             params,
-                            output_device_id,
-                            input_device_id),
+                            output_device_id),
       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() {
@@ skipping 86 matching lines @@
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   // Close all idle streams immediately.  The |close_timer_| will handle
   // invalidating any outstanding tasks upon its destruction.
   CloseAllIdleStreams();
 }
 
 bool AudioOutputDispatcherImpl::CreateAndOpenStream() {
   DCHECK(task_runner_->BelongsToCurrentThread());
   AudioOutputStream* stream = audio_manager_->MakeAudioOutputStream(
-      params_, output_device_id_, input_device_id_);
+      params_, device_id_);
   if (!stream)
     return false;
 
   if (!stream->Open()) {
     stream->Close();
     return false;
   }
 
   const int stream_id = audio_stream_id_++;
   audio_stream_ids_[stream] = stream_id;
   audio_log_->OnCreated(
-      stream_id, params_, input_device_id_, output_device_id_);
+      stream_id, params_, device_id_);
 
   idle_streams_.push_back(stream);
   return true;
 }
 
 void AudioOutputDispatcherImpl::CloseAllIdleStreams() {
   DCHECK(task_runner_->BelongsToCurrentThread());
   CloseIdleStreams(0);
 }
 
@@ skipping 20 matching lines @@
 
 void AudioOutputDispatcherImpl::RestartStreamsForWedgeFix() {
   DCHECK(task_runner_->BelongsToCurrentThread());
 
   // Should only be called when the dispatcher is used with fake streams which
   // don't need to be shutdown or restarted.
   CHECK_EQ(params_.format(), AudioParameters::AUDIO_FAKE);
 }
 
 }  // namespace media