chore: remove observers when SerialChooserContext is destroyed

electron · Jul 19, 2022 · 6222cab · 6222cab
1 parent f9d69e3
commit 6222cab
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/shell/browser/serial/serial_chooser_context.cc b/shell/browser/serial/serial_chooser_context.cc
@@ -90,7 +90,10 @@ base::Value PortInfoToValue(const device::mojom::SerialPortInfo& port) {
 SerialChooserContext::SerialChooserContext(ElectronBrowserContext* context)
     : browser_context_(context) {}
 
-SerialChooserContext::~SerialChooserContext() = default;
+SerialChooserContext::~SerialChooserContext() {
+  for (auto& observer : port_observer_list_)
+    port_observer_list_.RemoveObserver(&observer);
+}
 
 void SerialChooserContext::OnPermissionRevoked(const url::Origin& origin) {
   for (auto& observer : port_observer_list_)

diff --git a/shell/browser/serial/serial_chooser_controller.cc b/shell/browser/serial/serial_chooser_controller.cc
@@ -82,9 +82,6 @@ SerialChooserController::SerialChooserController(
 
 SerialChooserController::~SerialChooserController() {
   RunCallback(/*port=*/nullptr);
-  if (chooser_context_) {
-    chooser_context_->RemovePortObserver(this);
-  }
 }
 
 api::Session* SerialChooserController::GetSession() {
@@ -118,7 +115,7 @@ void SerialChooserController::OnPortRemoved(
 }
 
 void SerialChooserController::OnPortManagerConnectionError() {
-  // TODO(nornagon/jkleinsc): report event
+  observation_.Reset();
 }
 
 void SerialChooserController::OnDeviceChosen(const std::string& port_id) {