From 61de0e721f672e854551a8938d2d42ba946398cf Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Wed, 6 Oct 2021 17:06:14 +0200
Subject: Adaptations for Chromium 94

Change-Id: I9fb8998a3a7762b0aea70993ca231f0bbf4f7761
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
---
 src/core/media_capture_devices_dispatcher.h | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

(limited to 'src/core/media_capture_devices_dispatcher.h')

diff --git a/src/core/media_capture_devices_dispatcher.h b/src/core/media_capture_devices_dispatcher.h
index d2633cb83..91ddc30a8 100644
--- a/src/core/media_capture_devices_dispatcher.h
+++ b/src/core/media_capture_devices_dispatcher.h
@@ -41,14 +41,11 @@
 #ifndef MEDIA_CAPTURE_DEVICES_DISPATCHER_H
 #define MEDIA_CAPTURE_DEVICES_DISPATCHER_H
 
-#include <deque>
-#include <list>
-#include <map>
-
 #include "web_contents_adapter_client.h"
 
 #include "base/callback.h"
 #include "base/containers/circular_deque.h"
+#include "base/containers/flat_map.h"
 #include "base/memory/singleton.h"
 #include "base/observer_list.h"
 #include "chrome/browser/tab_contents/web_contents_collection.h"
@@ -92,20 +89,15 @@ private:
 
     friend struct base::DefaultSingletonTraits<MediaCaptureDevicesDispatcher>;
 
-    typedef base::RepeatingCallback<void(const blink::MediaStreamDevices &devices,
-                                         blink::mojom::MediaStreamRequestResult result,
-                                         std::unique_ptr<content::MediaStreamUI> ui)>
-            RepeatingMediaResponseCallback;
-
     struct PendingAccessRequest {
-        PendingAccessRequest(const content::MediaStreamRequest &request, const RepeatingMediaResponseCallback &callback);
+        PendingAccessRequest(const content::MediaStreamRequest &request, content::MediaResponseCallback callback);
         ~PendingAccessRequest();
 
         content::MediaStreamRequest request;
-        RepeatingMediaResponseCallback callback;
+        content::MediaResponseCallback callback;
     };
-    typedef base::circular_deque<PendingAccessRequest> RequestsQueue;
-    typedef std::map<content::WebContents *, RequestsQueue> RequestsQueues;
+    typedef base::circular_deque<std::unique_ptr<PendingAccessRequest>> RequestsQueue;
+    typedef base::flat_map<content::WebContents *, RequestsQueue> RequestsQueues;
 
     MediaCaptureDevicesDispatcher();
     virtual ~MediaCaptureDevicesDispatcher();
-- 
cgit v1.2.3