From 768daef27b1f44adcab7786c9d7247c2a3ef39e2 Mon Sep 17 00:00:00 2001 From: "trop[bot]" <37223003+trop[bot]@users.noreply.github.com> Date: Sat, 22 Feb 2025 09:46:16 -0600 Subject: [PATCH] refactor: use base's map utills in WebFrameMain (#45761) refactor: use base::FindPtrOrNull() in WebFrameMain::FromFrameTreeNodeId() refactor: use base::FindPtrOrNull() in WebFrameMain::FromFrameToken() Co-authored-by: trop[bot] <37223003+trop[bot]@users.noreply.github.com> Co-authored-by: Charles Kerr --- shell/browser/api/electron_api_web_frame_main.cc | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/shell/browser/api/electron_api_web_frame_main.cc b/shell/browser/api/electron_api_web_frame_main.cc index d9ff7366aafb..40e3d811baf8 100644 --- a/shell/browser/api/electron_api_web_frame_main.cc +++ b/shell/browser/api/electron_api_web_frame_main.cc @@ -9,6 +9,7 @@ #include #include +#include "base/containers/map_util.h" #include "base/feature_list.h" #include "base/logging.h" #include "base/no_destructor.h" @@ -121,19 +122,13 @@ FrameTokenMap& GetFrameTokenMap() { // static WebFrameMain* WebFrameMain::FromFrameTreeNodeId( content::FrameTreeNodeId frame_tree_node_id) { - FrameTreeNodeIdMap& frame_map = GetFrameTreeNodeIdMap(); - auto iter = frame_map.find(frame_tree_node_id); - auto* web_frame = iter == frame_map.end() ? nullptr : iter->second; - return web_frame; + return base::FindPtrOrNull(GetFrameTreeNodeIdMap(), frame_tree_node_id); } // static WebFrameMain* WebFrameMain::FromFrameToken( content::GlobalRenderFrameHostToken frame_token) { - FrameTokenMap& frame_map = GetFrameTokenMap(); - auto iter = frame_map.find(frame_token); - auto* web_frame = iter == frame_map.end() ? nullptr : iter->second; - return web_frame; + return base::FindPtrOrNull(GetFrameTokenMap(), frame_token); } // static