Revert 203686 "Trying relanding this CL, the original CL passed ..."

> Trying relanding this CL, the original CL passed the try bots but failed the mac 10.7 bot, I am keeping an eye on the bots and will revert it if it fails the bot again.
> 
> Hook up the device selection to the WebAudio live audio.
> WebAudio live audio needs to pass the session_id to the browser process so that Chrome can open the correct input device for unitfied IO.
> 
> This CL looks big because it touches quite some interfaces from the render to the browser. But the change is simple and basically adding a session_id/device_id to the classes. All the changes some together and it is very hard to break it down.
> It also makes the media output code more similar to the media input code as well, and it will be easier to merge them for the future.
> 
> TBR=henrika@chormium.org
> 
> BUG=147327
> TEST=http://chromium.googlecode.com/svn/trunk/samples/audio/visualizer-live.html
> Change the device using the camera icon on the right of the omnibox, then reload. Verify the sound is coming from the correct input device.
> 
> Review URL: https://codereview.chromium.org/15836006

TBR=xians@chromium.org

Review URL: https://codereview.chromium.org/16325002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203690 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 8 deletions

diff --git a/media/audio/audio_output_controller.h b/media/audio/audio_output_controller.h
index 1e56633..0a83bae 100644
--- a/media/audio/audio_output_controller.h
+++ b/media/audio/audio_output_controller.h
@@ -112,8 +112,7 @@ class MEDIA_EXPORT AudioOutputController
   // outlive AudioOutputController.
   static scoped_refptr<AudioOutputController> Create(
       AudioManager* audio_manager, EventHandler* event_handler,
-      const AudioParameters& params, const std::string& input_device_id,
-      SyncReader* sync_reader);
+      const AudioParameters& params, SyncReader* sync_reader);
 
   // Methods to control playback of the stream.
 
@@ -178,9 +177,7 @@ class MEDIA_EXPORT AudioOutputController
   static const int kPollPauseInMilliseconds;
 
   AudioOutputController(AudioManager* audio_manager, EventHandler* handler,
-                        const AudioParameters& params,
-                        const std::string& input_device_id,
-                        SyncReader* sync_reader);
+                        const AudioParameters& params, SyncReader* sync_reader);
 
   // The following methods are executed on the audio manager thread.
   void DoCreate(bool is_for_device_change);
@@ -213,9 +210,6 @@ class MEDIA_EXPORT AudioOutputController
   const AudioParameters params_;
   EventHandler* const handler_;
 
-  // Used by the unified IO to open the correct input device.
-  std::string input_device_id_;
-
   // Note: It's important to invalidate the weak pointers whenever stream_ is
   // changed.  See comment for weak_this_.
   AudioOutputStream* stream_;