FIXUP: Add minimal webrtcdesktopcapture api for hangout services extension

Change-Id: Ib99816dfa32aa469f7934d945de663cf532832b9
Reviewed-on: https://codereview.qt-project.org/c/qt/qtwebengine-chromium/+/442874
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

2 files changed, 8 insertions, 7 deletions

diff --git a/chromium/qtwebengine/browser/extensions/api/webrtc_desktop_capture_private/webrtc_desktop_capture_private_api.cc b/chromium/qtwebengine/browser/extensions/api/webrtc_desktop_capture_private/webrtc_desktop_capture_private_api.cc
index b59dd1a8fad..ec6b2b0e655 100644
--- a/chromium/qtwebengine/browser/extensions/api/webrtc_desktop_capture_private/webrtc_desktop_capture_private_api.cc
+++ b/chromium/qtwebengine/browser/extensions/api/webrtc_desktop_capture_private/webrtc_desktop_capture_private_api.cc
@@ -106,7 +106,7 @@ WebrtcDesktopCapturePrivateChooseDesktopMediaFunction::Run() {
     return RespondNow(Error(kTargetNotFoundError));
   }
 
-  content::RenderFrameHost* const main_frame = web_contents->GetMainFrame();
+  content::RenderFrameHost* const main_frame = web_contents->GetPrimaryMainFrame();
   content::MediaStreamRequest request(main_frame->GetProcess()->GetID() /* render_process_id */,
                                       main_frame->GetRoutingID() /* render_frame_id */,
                                       request_id_ /* page_request_id */,
@@ -131,7 +131,7 @@ WebrtcDesktopCapturePrivateChooseDesktopMediaFunction::Run() {
 void WebrtcDesktopCapturePrivateChooseDesktopMediaFunction::ProcessAccessRequestResponse(
       content::RenderFrameHost* const main_frame,
       const GURL &origin,
-      const blink::MediaStreamDevices& devices,
+      const blink::mojom::StreamDevicesSet& devicesSet,
       blink::mojom::MediaStreamRequestResult stream_request_result,
       std::unique_ptr<content::MediaStreamUI> stream_ui)
 {
@@ -140,12 +140,12 @@ void WebrtcDesktopCapturePrivateChooseDesktopMediaFunction::ProcessAccessRequest
     return;
   }
 
-  DCHECK(!devices.empty());
+  DCHECK(!devicesSet.stream_devices.empty());
 
   content::DesktopMediaID source = content::DesktopMediaID(content::DesktopMediaID::TYPE_SCREEN, 0);
-  blink::MediaStreamDevices::const_iterator it = devices.begin();
-  for (; it != devices.end(); ++it) {
-    content::DesktopMediaID id = content::DesktopMediaID::Parse(it->id);
+  auto it = devicesSet.stream_devices.begin();
+  for (; it != devicesSet.stream_devices.end(); ++it) {
+    content::DesktopMediaID id = content::DesktopMediaID::Parse((*it)->video_device->id);
     if (id.type == content::DesktopMediaID::TYPE_SCREEN) {
         source = id;
         break;
diff --git a/chromium/qtwebengine/browser/extensions/api/webrtc_desktop_capture_private/webrtc_desktop_capture_private_api.h b/chromium/qtwebengine/browser/extensions/api/webrtc_desktop_capture_private/webrtc_desktop_capture_private_api.h
index 323418dd26f..5584396d54d 100644
--- a/chromium/qtwebengine/browser/extensions/api/webrtc_desktop_capture_private/webrtc_desktop_capture_private_api.h
+++ b/chromium/qtwebengine/browser/extensions/api/webrtc_desktop_capture_private/webrtc_desktop_capture_private_api.h
@@ -52,6 +52,7 @@
 #include "content/public/browser/media_stream_request.h"
 #include "extensions/browser/extension_function.h"
 #include "third_party/blink/public/common/mediastream/media_stream_request.h"
+#include "third_party/blink/public/mojom/mediastream/media_stream.mojom-shared.h"
 
 namespace content {
 class RenderFrameHost;
@@ -70,7 +71,7 @@ class WebrtcDesktopCapturePrivateChooseDesktopMediaFunction : public ExtensionFu
   void ProcessAccessRequestResponse(
       content::RenderFrameHost* const main_frame,
       const GURL &origin,
-      const blink::MediaStreamDevices& devices,
+      const blink::mojom::StreamDevicesSet& devicesSet,
       blink::mojom::MediaStreamRequestResult stream_request_result,
       std::unique_ptr<content::MediaStreamUI> stream_ui);