Stop using renderer specific host ids in ResourceDispatcher. This allows it ...

chrome/plugin/plugin_channel.cc

 // Copyright (c) 2006-2008 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 <windows.h>
 
 #include "chrome/plugin/plugin_channel.h"
 
 #include "chrome/common/plugin_messages.h"
 #include "base/command_line.h"
+#include "base/process_util.h"
 #include "base/string_util.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/plugin/plugin_process.h"
 #include "chrome/plugin/plugin_thread.h"
 
-PluginChannel* PluginChannel::GetPluginChannel(
-    int process_id, HANDLE renderer_handle, MessageLoop* ipc_message_loop) {
-  // map renderer's process id to a (single) channel to that process
+PluginChannel* PluginChannel::GetPluginChannel(MessageLoop* ipc_message_loop) {
+  static int next_id;
   std::wstring channel_name = StringPrintf(
-      L"%d.r%d", GetCurrentProcessId(), process_id);
+      L"%d.r%d", GetCurrentProcessId(), ++next_id);
 
-  PluginChannelBase* result = PluginChannelBase::GetChannel(
+  return static_cast<PluginChannel*>(PluginChannelBase::GetChannel(
       channel_name,
       IPC::Channel::MODE_SERVER,
       ClassFactory,
       ipc_message_loop,
-      false);
-
-  PluginChannel* channel = static_cast<PluginChannel*>(result);
-  if (channel && !channel->renderer_handle())
-    channel->renderer_handle_.Set(renderer_handle);
-
-  return channel;
+      false));
 }
 
 PluginChannel::PluginChannel() : in_send_(0) {
   SendUnblockingOnlyDuringDispatch();
   PluginProcess::current()->AddRefProcess();
   const CommandLine* command_line = CommandLine::ForCurrentProcess();
   log_messages_ = command_line->HasSwitch(switches::kLogPluginMessages);
 }
 
 PluginChannel::~PluginChannel() {
@@ skipping 54 matching lines @@
 
 void PluginChannel::OnGenerateRouteID(int* route_id) {
   *route_id = GenerateRouteID();
 }
 
 int PluginChannel::GenerateRouteID() {
   static LONG last_id = 0;
   return InterlockedIncrement(&last_id);
 }
 
+void PluginChannel::OnChannelConnected(int32 peer_pid) {
+  renderer_handle_.Set(base::OpenProcessHandle(peer_pid));
+  PluginChannelBase::OnChannelConnected(peer_pid);
+}
+
 void PluginChannel::OnChannelError() {
   renderer_handle_.Set(NULL);
   PluginChannelBase::OnChannelError();
   CleanUp();
 }
 
 void PluginChannel::CleanUp() {
   // We need to clean up the stubs so that they call NPPDestroy.  This will
   // also lead to them releasing their reference on this object so that it can
   // be deleted.
   for (size_t i = 0; i < plugin_stubs_.size(); ++i)
     RemoveRoute(plugin_stubs_[i]->instance_id());
 
   // Need to addref this object temporarily because otherwise removing the last
   // stub will cause the destructor of this object to be called, however at
   // that point plugin_stubs_ will have one element and its destructor will be
   // called twice.
   scoped_refptr<PluginChannel> me(this);
 
   plugin_stubs_.clear();
 }