BASELINE: Update Chromium to 118.0.5993.24

Change-Id: I8373334b8ea8225ab4d934dc676aabc6a85a7efa

1 files changed, 11 insertions, 9 deletions

diff --git a/chromium/chrome/browser/extensions/api/messaging/chrome_messaging_delegate.cc b/chromium/chrome/browser/extensions/api/messaging/chrome_messaging_delegate.cc
index d062790716a..b4f1776306d 100644
--- a/chromium/chrome/browser/extensions/api/messaging/chrome_messaging_delegate.cc
+++ b/chromium/chrome/browser/extensions/api/messaging/chrome_messaging_delegate.cc
@@ -119,10 +119,10 @@ std::unique_ptr<MessagePort> ChromeMessagingDelegate::CreateReceiverForTab(
   bool include_child_frames =
       receiver_frame_id == -1 && receiver_document_id.empty();
 
-  content::RenderFrameHost* receiver_rfh = nullptr;
+  content::RenderFrameHost* receiver_render_frame_host = nullptr;
   if (include_child_frames) {
     // The target is the active outermost main frame of the WebContents.
-    receiver_rfh = receiver_contents->GetPrimaryMainFrame();
+    receiver_render_frame_host = receiver_contents->GetPrimaryMainFrame();
   } else if (!receiver_document_id.empty()) {
     ExtensionApiFrameIdMap::DocumentId document_id =
         ExtensionApiFrameIdMap::DocumentIdFromString(receiver_document_id);
@@ -131,28 +131,30 @@ std::unique_ptr<MessagePort> ChromeMessagingDelegate::CreateReceiverForTab(
     if (!document_id)
       return nullptr;
 
-    receiver_rfh =
+    receiver_render_frame_host =
         ExtensionApiFrameIdMap::Get()->GetRenderFrameHostByDocumentId(
             document_id);
 
     // If both |document_id| and |receiver_frame_id| are provided they
     // should find the same RenderFrameHost, if not return early.
     if (receiver_frame_id != -1 &&
-        ExtensionApiFrameIdMap::GetRenderFrameHostById(
-            receiver_contents, receiver_frame_id) != receiver_rfh) {
+        ExtensionApiFrameIdMap::GetRenderFrameHostById(receiver_contents,
+                                                       receiver_frame_id) !=
+            receiver_render_frame_host) {
       return nullptr;
     }
   } else {
     DCHECK_GT(receiver_frame_id, -1);
-    receiver_rfh = ExtensionApiFrameIdMap::GetRenderFrameHostById(
+    receiver_render_frame_host = ExtensionApiFrameIdMap::GetRenderFrameHostById(
         receiver_contents, receiver_frame_id);
   }
-  if (!receiver_rfh)
+  if (!receiver_render_frame_host) {
     return nullptr;
+  }
 
   return std::make_unique<ExtensionMessagePort>(
-      channel_delegate, receiver_port_id, extension_id, receiver_rfh,
-      include_child_frames);
+      channel_delegate, receiver_port_id, extension_id,
+      receiver_render_frame_host, include_child_frames);
 }
 
 std::unique_ptr<MessagePort>