[WebRTC][MM] Remove EWK_BRINGUP WebContentsDelegateEfl

The requested_video_device_id and requested_audio_device_id
have been changed to vectors of name requested_video_device_ids
and requested_audio_device_ids respectively.

Change-Id: I2d0c81d7444887b920a20f7d918ee1584bcc7612
Signed-off-by: Pranay Chauhan <pranay.c1@samsung.com>

diff --git a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc
index 7c903a320a1f8feda685b356ee02782db6da860a..a0dc4593c6791e97de19369380ea3793a286294f 100644 (file)
--- a/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc
+++ b/tizen_src/ewk/efl_integration/web_contents_delegate_efl.cc
@@ -327,11 +327,12 @@ void WebContentsDelegateEfl::RequestMediaAccessAllow(
   blink::mojom::StreamDevices& stream_devices =
       *stream_devices_set.stream_devices[0];
 
-#if !defined(EWK_BRINGUP)  // FIXME: m126 bringup
   if (request.audio_type ==
       blink::mojom::MediaStreamType::DEVICE_AUDIO_CAPTURE) {
-    const blink::MediaStreamDevice* audio_device =
-        GetRequestedAudioDevice(request.requested_audio_device_id);
+    const blink::MediaStreamDevice* audio_device = nullptr;
+    if(!request.requested_audio_device_ids.empty()) {
+      audio_device = GetRequestedAudioDevice(request.requested_audio_device_ids.front());
+    }
     if (audio_device) {
       stream_devices.audio_device = *audio_device;
     } else {
@@ -345,8 +346,10 @@ void WebContentsDelegateEfl::RequestMediaAccessAllow(
 
   if (request.video_type ==
       blink::mojom::MediaStreamType::DEVICE_VIDEO_CAPTURE) {
-    const blink::MediaStreamDevice* video_device =
-        GetRequestedVideoDevice(request.requested_video_device_id);
+    const blink::MediaStreamDevice* video_device = nullptr;
+    if (!request.requested_video_device_ids.empty()) {
+      video_device = GetRequestedVideoDevice(request.requested_video_device_ids.front());
+    }
     if (video_device) {
       stream_devices.video_device = *video_device;
     } else {
@@ -357,7 +360,6 @@ void WebContentsDelegateEfl::RequestMediaAccessAllow(
       return;
     }
   }
-#endif
 
   std::move(callback).Run(stream_devices_set,
                           blink::mojom::MediaStreamRequestResult::OK,