BASELINE: Update Chromium to 85.0.4183.14085-based

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

2 files changed, 6 insertions, 2 deletions

diff --git a/chromium/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container_manager.cc b/chromium/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container_manager.cc
index c1be9c9a9af..bbdb7a0db2b 100644
--- a/chromium/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container_manager.cc
+++ b/chromium/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container_manager.cc
@@ -270,6 +270,8 @@ void MimeHandlerViewContainerManager::RemoveFrameContainerForReason(
     bool retain_manager) {
   if (!RemoveFrameContainer(frame_container, retain_manager))
     return;
+  // At this point |this| may be invalid, but it's still OK to call
+  // RecordInteraction() as it's declared static.
   RecordInteraction(event);
 }
 
@@ -298,6 +300,7 @@ void MimeHandlerViewContainerManager::SetShowBeforeUnloadDialog(
   std::move(callback).Run();
 }
 
+// static
 void MimeHandlerViewContainerManager::RecordInteraction(UMAType type) {
   base::UmaHistogramEnumeration(MimeHandlerViewUMATypes::kUMAName, type);
 }
diff --git a/chromium/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container_manager.h b/chromium/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container_manager.h
index f513e21c394..8b5b1014f69 100644
--- a/chromium/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container_manager.h
+++ b/chromium/extensions/renderer/guest_view/mime_handler_view/mime_handler_view_container_manager.h
@@ -111,6 +111,9 @@ class MimeHandlerViewContainerManager
                const GURL& resource_url) override;
 
  private:
+  // Static so it can be called after self-deletion.
+  static void RecordInteraction(MimeHandlerViewUMATypes::Type type);
+
   // PostMessageSupport::Delegate overrides.
   blink::WebLocalFrame* GetSourceFrame() override;
   blink::WebFrame* GetTargetFrame() override;
@@ -126,8 +129,6 @@ class MimeHandlerViewContainerManager
       bool show_dialog,
       SetShowBeforeUnloadDialogCallback callback) override;
 
-  void RecordInteraction(MimeHandlerViewUMATypes::Type type);
-
   // Returns true if the |element| is managed by
   // MimeHandlerViewContainerManager; this would be the element that is added by
   // the HTML string injected at MimeHandlerViewAttachHelper.