diff --git a/shell/browser/serial/serial_chooser_context.cc b/shell/browser/serial/serial_chooser_context.cc index 594c9b41694d..49a57a4ffdf7 100644 --- a/shell/browser/serial/serial_chooser_context.cc +++ b/shell/browser/serial/serial_chooser_context.cc @@ -95,36 +95,18 @@ void SerialChooserContext::GrantPortPermission( const device::mojom::SerialPortInfo& port, content::RenderFrameHost* render_frame_host) { base::Value value = PortInfoToValue(port); - port_info_.insert({port.token, value.Clone()}); - - if (CanStorePersistentEntry(port)) { - auto* web_contents = - content::WebContents::FromRenderFrameHost(render_frame_host); - auto* permission_helper = - WebContentsPermissionHelper::FromWebContents(web_contents); - permission_helper->GrantSerialPortPermission(origin, std::move(value), - render_frame_host); - return; - } - - ephemeral_ports_[origin].insert(port.token); + auto* web_contents = + content::WebContents::FromRenderFrameHost(render_frame_host); + auto* permission_helper = + WebContentsPermissionHelper::FromWebContents(web_contents); + permission_helper->GrantSerialPortPermission(origin, std::move(value), + render_frame_host); } bool SerialChooserContext::HasPortPermission( const url::Origin& origin, const device::mojom::SerialPortInfo& port, content::RenderFrameHost* render_frame_host) { - auto it = ephemeral_ports_.find(origin); - if (it != ephemeral_ports_.end()) { - const std::set ports = it->second; - if (base::Contains(ports, port.token)) - return true; - } - - if (!CanStorePersistentEntry(port)) { - return false; - } - auto* web_contents = content::WebContents::FromRenderFrameHost(render_frame_host); auto* permission_helper = @@ -194,8 +176,6 @@ void SerialChooserContext::OnPortRemoved( device::mojom::SerialPortInfoPtr port) { for (auto& observer : port_observer_list_) observer.OnPortRemoved(*port); - - port_info_.erase(port->token); } void SerialChooserContext::EnsurePortManagerConnection() { @@ -221,10 +201,6 @@ void SerialChooserContext::SetUpPortManagerConnection( void SerialChooserContext::OnPortManagerConnectionError() { port_manager_.reset(); client_receiver_.reset(); - - port_info_.clear(); - - ephemeral_ports_.clear(); } } // namespace electron diff --git a/shell/browser/serial/serial_chooser_context.h b/shell/browser/serial/serial_chooser_context.h index 313ec7065c0d..0183b5877a51 100644 --- a/shell/browser/serial/serial_chooser_context.h +++ b/shell/browser/serial/serial_chooser_context.h @@ -82,12 +82,6 @@ class SerialChooserContext : public KeyedService, mojo::PendingRemote manager); void OnPortManagerConnectionError(); - // Tracks the set of ports to which an origin has access to. - std::map> ephemeral_ports_; - - // Holds information about ports in |ephemeral_ports_|. - std::map port_info_; - mojo::Remote port_manager_; mojo::Receiver client_receiver_{this}; base::ObserverList port_observer_list_;