Revert 274823 "Support for audio output devices for getMediaDevi..."

content/renderer/media/mock_media_stream_dispatcher.h

Index: content/renderer/media/mock_media_stream_dispatcher.h
===================================================================
--- content/renderer/media/mock_media_stream_dispatcher.h	(revision 278170)
+++ content/renderer/media/mock_media_stream_dispatcher.h	(working copy)
@@ -37,8 +37,7 @@
   virtual int video_session_id(const std::string& label, int index) OVERRIDE;
   virtual int audio_session_id(const std::string& label, int index) OVERRIDE;
 
-  int audio_input_request_id() const { return audio_input_request_id_; }
-  int audio_output_request_id() const { return audio_output_request_id_; }
+  int audio_request_id() const { return audio_request_id_; }
   int video_request_id() const { return video_request_id_; }
   int request_stream_counter() const { return request_stream_counter_; }
   void IncrementSessionId() { ++session_id_; }
@@ -47,21 +46,14 @@
   int stop_video_device_counter() const { return stop_video_device_counter_; }
 
   const std::string& stream_label() const { return stream_label_;}
-  const StreamDeviceInfoArray& audio_input_array() const {
-    return audio_input_array_;
-  }
-  const StreamDeviceInfoArray& audio_output_array() const {
-    return audio_output_array_;
-  }
-  const StreamDeviceInfoArray& video_array() const { return video_array_; }
+  StreamDeviceInfoArray audio_array() const { return audio_array_; }
+  StreamDeviceInfoArray video_array() const { return video_array_; }
 
  private:
-  void AddAudioInputDeviceToArray(bool matched_output);
-  void AddAudioOutputDeviceToArray();
+  void AddAudioDeviceToArray();
   void AddVideoDeviceToArray();
 
-  int audio_input_request_id_;
-  int audio_output_request_id_;  // Only used for EnumerateDevices.
+  int audio_request_id_;
   int video_request_id_;  // Only used for EnumerateDevices.
   base::WeakPtr<MediaStreamDispatcherEventHandler> event_handler_;
   int request_stream_counter_;
@@ -70,8 +62,7 @@
 
   std::string stream_label_;
   int session_id_;
-  StreamDeviceInfoArray audio_input_array_;
-  StreamDeviceInfoArray audio_output_array_;
+  StreamDeviceInfoArray audio_array_;
   StreamDeviceInfoArray video_array_;
 
   DISALLOW_COPY_AND_ASSIGN(MockMediaStreamDispatcher);