BASELINE: Update Chromium to 85.0.4183.14085-based

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>

1 files changed, 14 insertions, 11 deletions

diff --git a/chromium/components/plugins/renderer/webview_plugin.cc b/chromium/components/plugins/renderer/webview_plugin.cc
index 28f8accaf2b..5ac3ac97c00 100644
--- a/chromium/components/plugins/renderer/webview_plugin.cc
+++ b/chromium/components/plugins/renderer/webview_plugin.cc
@@ -277,14 +277,15 @@ WebViewPlugin::WebViewHelper::WebViewHelper(WebViewPlugin* plugin,
           blink::mojom::FrameWidgetHostInterfaceBase>(),
       blink::CrossVariantMojoAssociatedReceiver<
           blink::mojom::FrameWidgetInterfaceBase>(),
-      blink::CrossVariantMojoAssociatedRemote<
-          blink::mojom::WidgetHostInterfaceBase>(),
-      blink::CrossVariantMojoAssociatedReceiver<
-          blink::mojom::WidgetInterfaceBase>());
-
-  // The WebFrame created here was already attached to the Page as its
-  // main frame, and the WebFrameWidget has been initialized, so we can call
-  // WebViewImpl's DidAttachLocalMainFrame().
+      // TODO(dtapuska): https://crbug.com/1085031. Have the suffix ForTesting
+      // removed.
+      blink_widget_host_receiver_
+          .BindNewEndpointAndPassDedicatedRemoteForTesting(),
+      blink_widget_.BindNewEndpointAndPassDedicatedReceiverForTesting());
+
+  // The WebFrame created here was already attached to the Page as its main
+  // frame, and the WebFrameWidget has been initialized, so we can call
+  // WebView's DidAttachLocalMainFrame().
   web_view_->DidAttachLocalMainFrame();
 }
 
@@ -311,10 +312,12 @@ blink::WebScreenInfo WebViewPlugin::WebViewHelper::GetScreenInfo() {
 }
 
 void WebViewPlugin::WebViewHelper::SetToolTipText(
-    const WebString& text,
+    const base::string16& tooltip_text,
     base::i18n::TextDirection hint) {
-  if (plugin_->container_)
-    plugin_->container_->GetElement().SetAttribute("title", text);
+  if (plugin_->container_) {
+    plugin_->container_->GetElement().SetAttribute(
+        "title", WebString::FromUTF16(tooltip_text));
+  }
 }
 
 void WebViewPlugin::WebViewHelper::StartDragging(network::mojom::ReferrerPolicy,