From c30a6232df03e1efbd9f3b226777b07e087a1122 Mon Sep 17 00:00:00 2001
From: Allan Sandfeld Jensen <allan.jensen@qt.io>
Date: Mon, 12 Oct 2020 14:27:29 +0200
Subject: BASELINE: Update Chromium to 85.0.4183.140

Change-Id: Iaa42f4680837c57725b1344f108c0196741f6057
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
---
 chromium/components/ui_devtools/agent_util.cc              | 1 +
 chromium/components/ui_devtools/views/dom_agent_mac.mm     | 5 ++++-
 chromium/components/ui_devtools/views/overlay_agent_mac.mm | 1 +
 chromium/components/ui_devtools/views/widget_element.cc    | 1 +
 4 files changed, 7 insertions(+), 1 deletion(-)

(limited to 'chromium/components/ui_devtools')

diff --git a/chromium/components/ui_devtools/agent_util.cc b/chromium/components/ui_devtools/agent_util.cc
index 6334a2178de..fc4c83da8ce 100644
--- a/chromium/components/ui_devtools/agent_util.cc
+++ b/chromium/components/ui_devtools/agent_util.cc
@@ -7,6 +7,7 @@
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
+#include "base/logging.h"
 #include "base/path_service.h"
 #include "base/run_loop.h"
 #include "base/task/post_task.h"
diff --git a/chromium/components/ui_devtools/views/dom_agent_mac.mm b/chromium/components/ui_devtools/views/dom_agent_mac.mm
index 0a1e30bcc82..59fc8fdac3a 100644
--- a/chromium/components/ui_devtools/views/dom_agent_mac.mm
+++ b/chromium/components/ui_devtools/views/dom_agent_mac.mm
@@ -12,7 +12,10 @@
 namespace ui_devtools {
 
 DOMAgentMac::DOMAgentMac() {}
-DOMAgentMac::~DOMAgentMac() {}
+
+DOMAgentMac::~DOMAgentMac() {
+  CHECK(!IsInObserverList());
+}
 
 protocol::Response DOMAgentMac::enable() {
   views::NativeWidgetMac::SetInitNativeWidgetCallback(base::BindRepeating(
diff --git a/chromium/components/ui_devtools/views/overlay_agent_mac.mm b/chromium/components/ui_devtools/views/overlay_agent_mac.mm
index 308f91b5510..803809fd399 100644
--- a/chromium/components/ui_devtools/views/overlay_agent_mac.mm
+++ b/chromium/components/ui_devtools/views/overlay_agent_mac.mm
@@ -17,6 +17,7 @@ OverlayAgentMac::OverlayAgentMac(DOMAgent* dom_agent)
 OverlayAgentMac::~OverlayAgentMac() {
   if (is_pretarget_handler_)
     RemovePreTargetHandler();
+  CHECK(!IsInObserverList());
 }
 
 void OverlayAgentMac::InstallPreTargetHandler() {
diff --git a/chromium/components/ui_devtools/views/widget_element.cc b/chromium/components/ui_devtools/views/widget_element.cc
index 086e6617bab..ccd786d0b63 100644
--- a/chromium/components/ui_devtools/views/widget_element.cc
+++ b/chromium/components/ui_devtools/views/widget_element.cc
@@ -23,6 +23,7 @@ WidgetElement::~WidgetElement() {
     widget_->RemoveRemovalsObserver(this);
     widget_->RemoveObserver(this);
   }
+  CHECK(!IsInObserverList());
 }
 
 void WidgetElement::OnWillRemoveView(views::Widget* widget, views::View* view) {
-- 
cgit v1.2.1