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

content/renderer/media/media_stream_impl_unittest.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 "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/child/child_process.h"
 #include "content/renderer/media/media_stream.h"
 #include "content/renderer/media/media_stream_impl.h"
@@ skipping 145 matching lines @@
     desc.videoTracks(video_tracks);
 
     EXPECT_EQ(1u, audio_tracks.size());
     EXPECT_EQ(1u, video_tracks.size());
     EXPECT_NE(audio_tracks[0].id(), video_tracks[0].id());
     return desc;
   }
 
   void FakeMediaStreamDispatcherRequestUserMediaComplete() {
     // Audio request ID is used as the shared request ID.
-    ms_impl_->OnStreamGenerated(ms_dispatcher_->audio_input_request_id(),
+    ms_impl_->OnStreamGenerated(ms_dispatcher_->audio_request_id(),
                                 ms_dispatcher_->stream_label(),
-                                ms_dispatcher_->audio_input_array(),
+                                ms_dispatcher_->audio_array(),
                                 ms_dispatcher_->video_array());
   }
 
   void FakeMediaStreamDispatcherRequestMediaDevicesComplete() {
-    ms_impl_->OnDevicesEnumerated(ms_dispatcher_->audio_input_request_id(),
-                                  ms_dispatcher_->audio_input_array());
-    ms_impl_->OnDevicesEnumerated(ms_dispatcher_->audio_output_request_id(),
-                                  ms_dispatcher_->audio_output_array());
+    ms_impl_->OnDevicesEnumerated(ms_dispatcher_->audio_request_id(),
+                                  ms_dispatcher_->audio_array());
     ms_impl_->OnDevicesEnumerated(ms_dispatcher_->video_request_id(),
                                   ms_dispatcher_->video_array());
   }
 
   void StartMockedVideoSource() {
     MockMediaStreamVideoCapturerSource* video_source =
         ms_impl_->last_created_video_source();
     if (video_source->SourceHasAttemptedToStart())
       video_source->StartMockedSource();
   }
@@ skipping 243 matching lines @@
   EXPECT_EQ(1, ms_dispatcher_->stop_video_device_counter());
 }
 
 TEST_F(MediaStreamImplTest, EnumerateMediaDevices) {
   ms_impl_->RequestMediaDevices();
   FakeMediaStreamDispatcherRequestMediaDevicesComplete();
 
   EXPECT_EQ(MediaStreamImplUnderTest::REQUEST_SUCCEEDED,
             ms_impl_->request_state());
 
-  // Audio input device with matched output ID.
   EXPECT_FALSE(ms_impl_->last_devices()[0].deviceId().isEmpty());
   EXPECT_EQ(blink::WebMediaDeviceInfo::MediaDeviceKindAudioInput,
             ms_impl_->last_devices()[0].kind());
   EXPECT_FALSE(ms_impl_->last_devices()[0].label().isEmpty());
-  EXPECT_FALSE(ms_impl_->last_devices()[0].groupId().isEmpty());
 
-  // Audio input device without matched output ID.
   EXPECT_FALSE(ms_impl_->last_devices()[1].deviceId().isEmpty());
-  EXPECT_EQ(blink::WebMediaDeviceInfo::MediaDeviceKindAudioInput,
+  EXPECT_EQ(blink::WebMediaDeviceInfo::MediaDeviceKindVideoInput,
             ms_impl_->last_devices()[1].kind());
   EXPECT_FALSE(ms_impl_->last_devices()[1].label().isEmpty());
-  EXPECT_FALSE(ms_impl_->last_devices()[1].groupId().isEmpty());
-
-  // Video input device.
-  EXPECT_FALSE(ms_impl_->last_devices()[2].deviceId().isEmpty());
-  EXPECT_EQ(blink::WebMediaDeviceInfo::MediaDeviceKindVideoInput,
-            ms_impl_->last_devices()[2].kind());
-  EXPECT_FALSE(ms_impl_->last_devices()[2].label().isEmpty());
-  EXPECT_TRUE(ms_impl_->last_devices()[2].groupId().isEmpty());
-
-  // Audio output device.
-  EXPECT_FALSE(ms_impl_->last_devices()[3].deviceId().isEmpty());
-  EXPECT_EQ(blink::WebMediaDeviceInfo::MediaDeviceKindAudioOutput,
-            ms_impl_->last_devices()[3].kind());
-  EXPECT_FALSE(ms_impl_->last_devices()[3].label().isEmpty());
-  EXPECT_FALSE(ms_impl_->last_devices()[3].groupId().isEmpty());
-
-  // Verfify group IDs.
-  EXPECT_TRUE(ms_impl_->last_devices()[0].groupId().equals(
-                  ms_impl_->last_devices()[3].groupId()));
-  EXPECT_FALSE(ms_impl_->last_devices()[1].groupId().equals(
-                   ms_impl_->last_devices()[3].groupId()));
 }
 
 }  // namespace content