Delete TODO-comment about guest process/frame IDs in MessageService::OpenChannelImpl

chrome/browser/extensions/api/messaging/message_service.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/extensions/api/messaging/message_service.h"
 
 #include <stdint.h>
 #include <limits>
 #include <utility>
 
@@ skipping 576 matching lines @@
     return;
   }
 
   std::unique_ptr<MessageChannel> channel_ptr =
       base::MakeUnique<MessageChannel>();
   MessageChannel* channel = channel_ptr.get();
   channel->opener.reset(opener.release());
   channel->receiver.reset(params->receiver.release());
   AddChannel(std::move(channel_ptr), params->receiver_port_id);
 
-  // TODO(robwu): Could |guest_process_id| and |guest_render_frame_routing_id|
-  // be removed? In the past extension message routing was process-based, but
-  // now that extensions are routed from a specific RFH, the special casing for
-  // guest views seems no longer necessary, because the ExtensionMessagePort can
-  // simply obtain the source process & frame ID directly from the RFH.
-  int guest_process_id = content::ChildProcessHost::kInvalidUniqueID;
-  int guest_render_frame_routing_id = MSG_ROUTING_NONE;
-  if (params->include_guest_process_info) {
-    guest_process_id = params->source_process_id;
-    guest_render_frame_routing_id = params->source_routing_id;
-
-    DCHECK(WebViewGuest::FromWebContents(
-            WebContents::FromRenderFrameHost(source)));
-  }
-
   // Send the connect event to the receiver.  Give it the opener's port ID (the
   // opener has the opposite port ID).
   channel->receiver->DispatchOnConnect(
       params->channel_name, std::move(params->source_tab),
-      params->source_frame_id, guest_process_id, guest_render_frame_routing_id,
+      params->source_frame_id, params->include_guest_process_info,
+      params->source_process_id, params->source_routing_id,
       params->source_extension_id, params->target_extension_id,
       params->source_url, params->tls_channel_id);
 
   // Report the event to the event router, if the target is an extension.
   //
   // First, determine what event this will be (runtime.onConnect vs
   // runtime.onMessage etc), and what the event target is (view vs background
   // page etc).
   //
   // Yes - even though this is opening a channel, they may actually be
@@ skipping 391 matching lines @@
   MessageChannelMap::iterator channel_iter = channels_.find(channel_id);
   if (channel_iter != channels_.end()) {
     for (const PendingMessage& message : queue) {
       DispatchMessage(message.first, channel_iter->second.get(),
                       message.second);
     }
   }
 }
 
 }  // namespace extensions