Reland 153623004: Remove the unified IO code on the browser

media/audio/audio_output_controller.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_CONTROLLER_H_
 #define MEDIA_AUDIO_AUDIO_OUTPUT_CONTROLLER_H_
 
 #include "base/atomic_ref_count.h"
 #include "base/callback.h"
 #include "base/cancelable_callback.h"
@@ skipping 89 matching lines @@
     // Close this synchronous reader.
     virtual void Close() = 0;
   };
 
   // Factory method for creating an AudioOutputController.
   // This also creates and opens an AudioOutputStream on the audio manager
   // thread, and if this is successful, the |event_handler| will receive an
   // OnCreated() call from the same audio manager thread.  |audio_manager| must
   // outlive AudioOutputController.
   // The |output_device_id| can be either empty (default device) or specify a
-  // specific hardware device for audio output.  The |input_device_id| is
-  // used only for unified audio when opening up input and output at the same
-  // time (controlled by |params.input_channel_count()|).
+  // specific hardware device for audio output.
   static scoped_refptr<AudioOutputController> Create(
       AudioManager* audio_manager, EventHandler* event_handler,
       const AudioParameters& params, const std::string& output_device_id,
-      const std::string& input_device_id, SyncReader* sync_reader);
+      SyncReader* sync_reader);
 
   // Methods to control playback of the stream.
 
   // Starts the playback of this audio output stream.
   void Play();
 
   // Pause this audio output stream.
   void Pause();
 
   // Closes the audio output stream. The state is changed and the resources
@@ skipping 59 matching lines @@
   virtual ~AudioOutputController();
 
  private:
   // We are polling sync reader if data became available.
   static const int kPollNumAttempts;
   static const int kPollPauseInMilliseconds;
 
   AudioOutputController(AudioManager* audio_manager, EventHandler* handler,
                         const AudioParameters& params,
                         const std::string& output_device_id,
-                        const std::string& input_device_id,
                         SyncReader* sync_reader);
 
   // The following methods are executed on the audio manager thread.
   void DoCreate(bool is_for_device_change);
   void DoPlay();
   void DoPause();
   void DoClose();
   void DoSetVolume(double volume);
   std::string DoGetOutputDeviceId() const;
   void DoSwitchOutputDevice(const std::string& output_device_id);
@@ skipping 20 matching lines @@
   void WedgeCheck();
 
   AudioManager* const audio_manager_;
   const AudioParameters params_;
   EventHandler* const handler_;
 
   // Specifies the device id of the output device to open or empty for the
   // default output device.
   std::string output_device_id_;
 
-  // Used by the unified IO to open the correct input device.
-  const std::string input_device_id_;
-
   AudioOutputStream* stream_;
 
   // When non-NULL, audio is being diverted to this stream.
   AudioOutputStream* diverting_to_stream_;
 
   // The current volume of the audio stream.
   double volume_;
 
   // |state_| is written on the audio manager thread and is read on the
   // hardware audio thread. These operations need to be locked. But lock
@@ skipping 24 matching lines @@
   // Flags when we've asked for a stream to start but it never did.
   base::AtomicRefCount on_more_io_data_called_;
   scoped_ptr<base::OneShotTimer<AudioOutputController> > wedge_timer_;
 
   DISALLOW_COPY_AND_ASSIGN(AudioOutputController);
 };
 
 }  // namespace media
 
 #endif  // MEDIA_AUDIO_AUDIO_OUTPUT_CONTROLLER_H_