Adaptations for 106-based

Change-Id: I2fe91c06ce91dfaace7825a0589b56ee375479b6
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>
Reviewed-by: Michal Klocek <michal.klocek@qt.io>

6 files changed, 27 insertions, 22 deletions

diff --git a/src/core/renderer/content_renderer_client_qt.cpp b/src/core/renderer/content_renderer_client_qt.cpp
index cdb4fdf12..4c175768d 100644
--- a/src/core/renderer/content_renderer_client_qt.cpp
+++ b/src/core/renderer/content_renderer_client_qt.cpp
@@ -127,14 +127,17 @@ void ContentRendererClientQt::RenderThreadStarted()
 
 void ContentRendererClientQt::ExposeInterfacesToBrowser(mojo::BinderMap* binders)
 {
-    binders->Add(m_visitedLinkReader->GetBindCallback(), base::SequencedTaskRunnerHandle::Get());
+    binders->Add<visitedlink::mojom::VisitedLinkNotificationSink>(
+                m_visitedLinkReader->GetBindCallback(), base::SequencedTaskRunnerHandle::Get());
 
-    binders->Add(base::BindRepeating(&web_cache::WebCacheImpl::BindReceiver,
-                                     base::Unretained(m_webCacheImpl.get())),
-                 base::SequencedTaskRunnerHandle::Get());
+    binders->Add<web_cache::mojom::WebCache>(
+                base::BindRepeating(&web_cache::WebCacheImpl::BindReceiver,
+                                    base::Unretained(m_webCacheImpl.get())),
+                base::SequencedTaskRunnerHandle::Get());
 
 #if QT_CONFIG(webengine_spellchecker)
-    binders->Add(base::BindRepeating(
+    binders->Add<spellcheck::mojom::SpellChecker>(
+                 base::BindRepeating(
                          [](ContentRendererClientQt *client,
                             mojo::PendingReceiver<spellcheck::mojom::SpellChecker> receiver) {
                              if (!client->m_spellCheck)
@@ -145,7 +148,8 @@ void ContentRendererClientQt::ExposeInterfacesToBrowser(mojo::BinderMap* binders
 #endif
 
 #if QT_CONFIG(webengine_webrtc) && QT_CONFIG(webengine_extensions)
-    binders->Add(base::BindRepeating(
+    binders->Add<chrome::mojom::WebRtcLoggingAgent>(
+                 base::BindRepeating(
                          [](ContentRendererClientQt *client,
                             mojo::PendingReceiver<chrome::mojom::WebRtcLoggingAgent> receiver) {
                                 client->GetWebRtcLoggingAgent()->AddReceiver(std::move(receiver));
@@ -179,9 +183,10 @@ void ContentRendererClientQt::RenderFrameCreated(content::RenderFrame *render_fr
     blink::AssociatedInterfaceRegistry *associated_interfaces = render_frame_observer->associatedInterfaces();
 
 #if BUILDFLAG(ENABLE_EXTENSIONS)
-    associated_interfaces->AddInterface(base::BindRepeating(
-        &extensions::MimeHandlerViewContainerManager::BindReceiver,
-        render_frame->GetRoutingID()));
+    associated_interfaces->AddInterface<extensions::mojom::MimeHandlerViewContainerManager>(
+                base::BindRepeating(
+                    &extensions::MimeHandlerViewContainerManager::BindReceiver,
+                    render_frame->GetRoutingID()));
 
     auto registry = std::make_unique<service_manager::BinderRegistry>();
     ExtensionsRendererClientQt::GetInstance()->RenderFrameCreated(render_frame, render_frame_observer->registry());
@@ -285,7 +290,7 @@ void ContentRendererClientQt::GetNavigationErrorStringsInternal(content::RenderF
         if (template_html.empty())
             NOTREACHED() << "unable to load template. ID: " << resourceId;
         else // "t" is the id of the templates root node.
-            *errorHtml = webui::GetTemplatesHtml(template_html, &errorPageState.strings, "t");
+            *errorHtml = webui::GetTemplatesHtml(template_html, errorPageState.strings, "t");
     }
 }
 
@@ -472,7 +477,7 @@ static void AddExternalClearKey(const media::mojom::KeySystemCapabilityPtr &capa
 }
 
 #if BUILDFLAG(ENABLE_WIDEVINE)
-media::SupportedCodecs GetVP9Codecs(const std::vector<media::VideoCodecProfile> &profiles)
+media::SupportedCodecs GetVP9Codecs(const base::flat_set<media::VideoCodecProfile> &profiles)
 {
     if (profiles.empty()) {
         // If no profiles are specified, then all are supported.
@@ -560,7 +565,7 @@ static media::SupportedCodecs GetSupportedCodecs(const media::CdmCapability& cap
             supported_codecs |= media::EME_CODEC_VP8;
             break;
         case media::VideoCodec::kVP9:
-            supported_codecs |= GetVP9Codecs(codec.second);
+            supported_codecs |= GetVP9Codecs(codec.second.supported_profiles);
             break;
         case media::VideoCodec::kAV1:
             supported_codecs |= media::EME_CODEC_AV1;
@@ -572,7 +577,7 @@ static media::SupportedCodecs GetSupportedCodecs(const media::CdmCapability& cap
 #endif // BUILDFLAG(USE_PROPRIETARY_CODECS)
 #if BUILDFLAG(ENABLE_PLATFORM_HEVC)
         case media::VideoCodec::kHEVC:
-            supported_codecs |= GetHevcCodecs(codec.second);
+            supported_codecs |= GetHevcCodecs(codec.second.supported_profiles);
             break;
 #endif  // BUILDFLAG(ENABLE_PLATFORM_HEVC)
         default:
diff --git a/src/core/renderer/plugins/loadable_plugin_placeholder_qt.cpp b/src/core/renderer/plugins/loadable_plugin_placeholder_qt.cpp
index 70fd791fd..06fd4f71f 100644
--- a/src/core/renderer/plugins/loadable_plugin_placeholder_qt.cpp
+++ b/src/core/renderer/plugins/loadable_plugin_placeholder_qt.cpp
@@ -40,11 +40,11 @@ LoadablePluginPlaceholderQt* LoadablePluginPlaceholderQt::CreateLoadableMissingP
 {
     std::string template_html(ui::ResourceBundle::GetSharedInstance().LoadDataResourceString(IDR_BLOCKED_PLUGIN_HTML));
 
-    base::DictionaryValue values;
-    values.SetString("name", "");
-    values.SetString("message", l10n_util::GetStringUTF8(IDS_PLUGIN_NOT_SUPPORTED));
+    base::Value::Dict values;
+    values.Set("name", "");
+    values.Set("message", l10n_util::GetStringUTF8(IDS_PLUGIN_NOT_SUPPORTED));
 
-    const std::string html_data = webui::GetI18nTemplateHtml(template_html, &values);
+    const std::string html_data = webui::GetI18nTemplateHtml(template_html, std::move(values));
 
     // Will destroy itself when its WebViewPlugin is going away.
     return new LoadablePluginPlaceholderQt(render_frame, params, html_data, params.mime_type.Utf16());
diff --git a/src/core/renderer/render_configuration.cpp b/src/core/renderer/render_configuration.cpp
index 078655496..7b35cdd48 100644
--- a/src/core/renderer/render_configuration.cpp
+++ b/src/core/renderer/render_configuration.cpp
@@ -16,7 +16,7 @@ bool RenderConfiguration::m_isIncognitoProcess = false;
 void RenderConfiguration::RegisterMojoInterfaces(
         blink::AssociatedInterfaceRegistry *associated_interfaces)
 {
-    associated_interfaces->AddInterface(
+    associated_interfaces->AddInterface<qtwebengine::mojom::RendererConfiguration>(
             base::BindRepeating(&RenderConfiguration::OnRendererConfigurationAssociatedRequest,
                                 base::Unretained(this)));
 }
diff --git a/src/core/renderer/user_resource_controller.cpp b/src/core/renderer/user_resource_controller.cpp
index cc9989695..c49ecd391 100644
--- a/src/core/renderer/user_resource_controller.cpp
+++ b/src/core/renderer/user_resource_controller.cpp
@@ -182,7 +182,7 @@ UserResourceController::RenderFrameObserverHelper::RenderFrameObserverHelper(
     , m_binding(this)
     , m_userResourceController(controller)
 {
-    render_frame->GetAssociatedInterfaceRegistry()->AddInterface(
+    render_frame->GetAssociatedInterfaceRegistry()->AddInterface<qtwebengine::mojom::UserResourceControllerRenderFrame>(
             base::BindRepeating(&UserResourceController::RenderFrameObserverHelper::BindReceiver,
                                 base::Unretained(this)));
 }
@@ -347,7 +347,7 @@ void UserResourceController::ClearScripts()
 void UserResourceController::RegisterMojoInterfaces(
         blink::AssociatedInterfaceRegistry *associated_interfaces)
 {
-    associated_interfaces->AddInterface(
+    associated_interfaces->AddInterface<qtwebengine::mojom::UserResourceController>(
             base::BindRepeating(&UserResourceController::BindReceiver, base::Unretained(this)));
 }
 
diff --git a/src/core/renderer/web_channel_ipc_transport.cpp b/src/core/renderer/web_channel_ipc_transport.cpp
index 4f753d112..04a4ce705 100644
--- a/src/core/renderer/web_channel_ipc_transport.cpp
+++ b/src/core/renderer/web_channel_ipc_transport.cpp
@@ -139,7 +139,7 @@ WebChannelIPCTransport::WebChannelIPCTransport(content::RenderFrame *renderFrame
     , m_worldInitialized(false)
     , m_binding(this)
 {
-    renderFrame->GetAssociatedInterfaceRegistry()->AddInterface(
+    renderFrame->GetAssociatedInterfaceRegistry()->AddInterface<qtwebchannel::mojom::WebChannelTransportRender>(
             base::BindRepeating(&WebChannelIPCTransport::BindReceiver, base::Unretained(this)));
 }
 
diff --git a/src/core/renderer/web_engine_page_render_frame.cpp b/src/core/renderer/web_engine_page_render_frame.cpp
index 7b4851382..1e7ac62fc 100644
--- a/src/core/renderer/web_engine_page_render_frame.cpp
+++ b/src/core/renderer/web_engine_page_render_frame.cpp
@@ -15,7 +15,7 @@ namespace QtWebEngineCore {
 WebEnginePageRenderFrame::WebEnginePageRenderFrame(content::RenderFrame *render_frame)
     : content::RenderFrameObserver(render_frame), m_binding(this), m_ready(false)
 {
-    render_frame->GetAssociatedInterfaceRegistry()->AddInterface(
+    render_frame->GetAssociatedInterfaceRegistry()->AddInterface<qtwebenginepage::mojom::WebEnginePageRenderFrame>(
             base::BindRepeating(&WebEnginePageRenderFrame::BindReceiver, base::Unretained(this)));
 }