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

extensions/renderer/messaging_bindings.cc

 // Copyright 2014 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 "extensions/renderer/messaging_bindings.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <string>
@@ skipping 57 matching lines @@
 }
 
 void DispatchOnConnectToScriptContext(
     int global_target_port_id,
     const std::string& channel_name,
     const ExtensionMsg_TabConnectionInfo* source,
     const ExtensionMsg_ExternalConnectionInfo& info,
     const std::string& tls_channel_id,
     bool* port_created,
     ScriptContext* script_context) {
+  if (info.source_is_in_same_process &&
+      info.source_render_frame_routing_id ==
+          script_context->GetRenderFrame()->GetRoutingID())
+    return;
+
   MessagingBindings* bindings = g_messaging_map.Get()[script_context];
   DCHECK(bindings);
 
   int opposite_port_id = global_target_port_id ^ 1;
   if (bindings->GetPortWithGlobalId(opposite_port_id))
     return;  // The channel was opened by this same context; ignore it.
 
   ExtensionPort* port =
       bindings->CreateNewPortWithGlobalId(global_target_port_id);
   int local_port_id = port->local_id();
@@ skipping 27 matching lines @@
     if (externally_connectable &&
         externally_connectable->accepts_tls_channel_id) {
       v8::Local<v8::String> v8_tls_channel_id;
       if (ToV8String(isolate, tls_channel_id.c_str(), &v8_tls_channel_id))
         tls_channel_id_value = v8_tls_channel_id;
     }
 
     if (info.guest_process_id != content::ChildProcessHost::kInvalidUniqueID) {
       guest_process_id = v8::Integer::New(isolate, info.guest_process_id);
       guest_render_frame_routing_id =
-          v8::Integer::New(isolate, info.guest_render_frame_routing_id);
+          v8::Integer::New(isolate, info.source_render_frame_routing_id);
     }
   }
 
   v8::Local<v8::String> v8_channel_name;
   v8::Local<v8::String> v8_source_id;
   v8::Local<v8::String> v8_target_extension_id;
   v8::Local<v8::String> v8_source_url_spec;
   if (!ToV8String(isolate, channel_name.c_str(), &v8_channel_name) ||
       !ToV8String(isolate, info.source_id.c_str(), &v8_source_id) ||
       !ToV8String(isolate, target_extension_id.c_str(),
@@ skipping 449 matching lines @@
   DCHECK(iter != disconnected_ports_.end());
   iter->second->SetGlobalId(global_id);
   // Setting the global id dispatches pending messages, so we can delete the
   // port now.
   disconnected_ports_.erase(iter);
 }
 
 int MessagingBindings::GetNextLocalId() { return next_local_id_++; }
 
 }  // namespace extensions