commit 12b6478748ab6861decf5f8e3799d7abfaac5a98
author Istiaque Ahmed <lazyboy@chromium.org> Thu Jan 03 01:42:27 2019
committer Commit Bot <commit-bot@chromium.org> Thu Jan 03 01:42:27 2019
tree 274d1c2001ece62c9ad71cc5667fd1eaa91f5893
parent 3cafe43c57fc74537a48fa4f740f53b962d87a42

[Extensions] Cleanup: Remove duplicate RFH retrieval code.

Bug: None
Change-Id: I8b5c88b97f0214298264d57212e5aa3b18a31d2d
Reviewed-on: https://chromium-review.googlesource.com/c/1387984
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Commit-Queue: Istiaque Ahmed <lazyboy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#619558}

extensions/browser/api/messaging/message_service.cc

diff --git a/extensions/browser/api/messaging/message_service.cc b/extensions/browser/api/messaging/message_service.cc
index a53c440..9d29946 100644
--- a/extensions/browser/api/messaging/message_service.cc
+++ b/extensions/browser/api/messaging/message_service.cc
@@ -205,11 +205,12 @@
   // request if the target extension is not externally connectable.
   const bool requested_include_tls_channel_id = include_tls_channel_id;
 
-  content::RenderFrameHost* source =
+  content::RenderFrameHost* source_render_frame_host =
       content::RenderFrameHost::FromID(source_process_id, source_routing_id);
-  if (!source)
+  if (!source_render_frame_host)
     return;
-  BrowserContext* context = source->GetProcess()->GetBrowserContext();
+  BrowserContext* context =
+      source_render_frame_host->GetProcess()->GetBrowserContext();
 
   ExtensionRegistry* registry = ExtensionRegistry::Get(context);
   const Extension* target_extension =
@@ -217,8 +218,8 @@
   PortId receiver_port_id(source_port_id.context_id, source_port_id.port_number,
                           false);
   if (!target_extension) {
-    DispatchOnDisconnect(
-        source, receiver_port_id, kReceivingEndDoesntExistError);
+    DispatchOnDisconnect(source_render_frame_host, receiver_port_id,
+                         kReceivingEndDoesntExistError);
     return;
   }
 
@@ -260,19 +261,15 @@
       // Important: use kReceivingEndDoesntExistError here so that we don't
       // leak information about this extension to callers. This way it's
       // indistinguishable from the extension just not existing.
-      DispatchOnDisconnect(
-          source, receiver_port_id, kReceivingEndDoesntExistError);
+      DispatchOnDisconnect(source_render_frame_host, receiver_port_id,
+                           kReceivingEndDoesntExistError);
       return;
     }
   }
 
-  WebContents* source_contents = nullptr;
-  content::RenderFrameHost* source_render_frame_host =
-      content::RenderFrameHost::FromID(source_process_id, source_routing_id);
-  if (source_render_frame_host) {
-    source_contents =
-        WebContents::FromRenderFrameHost(source_render_frame_host);
-  }
+  DCHECK(source_render_frame_host);
+  WebContents* source_contents =
+      WebContents::FromRenderFrameHost(source_render_frame_host);
 
   int source_frame_id = -1;
   bool include_guest_process_info = false;