Reland 153623004: Remove the unified IO code on the browser

media/audio/audio_output_dispatcher.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.
 
 // AudioOutputDispatcher is a single-threaded base class that dispatches
 // creation and deletion of audio output streams. AudioOutputProxy objects use
 // this class to allocate and recycle actual audio output streams. When playback
 // is started, the proxy calls StartStream() to get an output stream that it
 // uses to play audio. When playback is stopped, the proxy returns the stream
 // back to the dispatcher by calling StopStream().
@@ skipping 20 matching lines @@
 
 namespace media {
 
 class AudioOutputProxy;
 
 class MEDIA_EXPORT AudioOutputDispatcher
     : public base::RefCountedThreadSafe<AudioOutputDispatcher> {
  public:
   AudioOutputDispatcher(AudioManager* audio_manager,
                         const AudioParameters& params,
-                        const std::string& output_device_id,
-                        const std::string& input_device_id);
+                        const std::string& device_id);
 
   // Called by AudioOutputProxy to open the stream.
   // Returns false, if it fails to open it.
   virtual bool OpenStream() = 0;
 
   // Called by AudioOutputProxy when the stream is started.
   // Uses |callback| to get source data and report errors, if any.
   // Does *not* take ownership of this callback.
   // Returns true if started successfully, false otherwise.
   virtual bool StartStream(AudioOutputStream::AudioSourceCallback* callback,
@@ skipping 13 matching lines @@
   // Called on the audio thread when the AudioManager is shutting down.
   virtual void Shutdown() = 0;
 
   // Called by the AudioManager to restart streams when a wedge is detected.  A
   // wedge means the OS failed to request any audio after StartStream().  When a
   // wedge is detected all streams across all dispatchers must be closed.  After
   // all streams are closed, streams are restarted.  See http://crbug.com/160920
   virtual void CloseStreamsForWedgeFix() = 0;
   virtual void RestartStreamsForWedgeFix() = 0;
 
-  // Accessor to the input device id used by unified IO.
-  const std::string& input_device_id() const { return input_device_id_; }
+  const std::string& device_id() const { return device_id_; }
 
  protected:
   friend class base::RefCountedThreadSafe<AudioOutputDispatcher>;
   virtual ~AudioOutputDispatcher();
 
   // A no-reference-held pointer (we don't want circular references) back to the
   // AudioManager that owns this object.
   AudioManager* audio_manager_;
   const scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
   const AudioParameters params_;
-  std::string output_device_id_;
-  const std::string input_device_id_;
+  std::string device_id_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AudioOutputDispatcher);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_OUTPUT_DISPATCHER_H_