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

chrome/browser/plugin_process_host.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 "build/build_config.h"
 
 #include "chrome/browser/plugin_process_host.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
@@ skipping 354 matching lines @@
 #endif  // defined(OS_WIN)
 
 PluginProcessHost::PluginProcessHost(MessageLoop* main_message_loop)
     : ChildProcessHost(PLUGIN_PROCESS, main_message_loop),
       ALLOW_THIS_IN_INITIALIZER_LIST(resolve_proxy_msg_helper_(this, NULL)) {
 }
 
 PluginProcessHost::~PluginProcessHost() {
   // Cancel all requests for plugin process.
   PluginService::GetInstance()->resource_dispatcher_host()->
-      CancelRequestsForProcess(-1);
+      CancelRequestsForProcess(pid());
 
 #if defined(OS_WIN)
   // We erase HWNDs from the plugin_parent_windows_set_ when we receive a
   // notification that the window is being destroyed. If we don't receive this
   // notification and the PluginProcessHost instance is being destroyed, it
   // means that the plugin process crashed. We paint a sad face in this case in
   // the renderer process. To ensure that the sad face shows up, and we don't
   // leak HWNDs, we should destroy existing plugin parent windows.
   std::set<HWND>::iterator window_index;
   for (window_index = plugin_parent_windows_set_.begin();
@@ skipping 225 matching lines @@
     int request_id,
     const ViewHostMsg_Resource_Request& request) {
   URLRequestContext* context = CPBrowsingContextManager::Instance()->
         ToURLRequestContext(request.request_context);
   // TODO(mpcomplete): remove fallback case when Gears support is prevalent.
   if (!context)
     context = Profile::GetDefaultRequestContext();
 
   PluginService::GetInstance()->resource_dispatcher_host()->
       BeginRequest(this, ChildProcessInfo::PLUGIN_PROCESS, handle(),
-                   -1, MSG_ROUTING_CONTROL, request_id,
+                   pid(), MSG_ROUTING_CONTROL, request_id,
                    request, context, NULL);
 }
 
 void PluginProcessHost::OnCancelRequest(int request_id) {
   PluginService::GetInstance()->resource_dispatcher_host()->
-      CancelRequest(-1, request_id, true);
+      CancelRequest(pid(), request_id, true);
 }
 
 void PluginProcessHost::OnDataReceivedACK(int request_id) {
   PluginService::GetInstance()->resource_dispatcher_host()->
-      OnDataReceivedACK(-1, request_id);
+      OnDataReceivedACK(pid(), request_id);
 }
 
 void PluginProcessHost::OnUploadProgressACK(int request_id) {
   PluginService::GetInstance()->resource_dispatcher_host()->
-      OnUploadProgressACK(-1, request_id);
+      OnUploadProgressACK(pid(), request_id);
 }
 
 void PluginProcessHost::OnSyncLoad(
     int request_id,
     const ViewHostMsg_Resource_Request& request,
     IPC::Message* sync_result) {
   URLRequestContext* context = CPBrowsingContextManager::Instance()->
         ToURLRequestContext(request.request_context);
   // TODO(mpcomplete): remove fallback case when Gears support is prevalent.
   if (!context)
     context = Profile::GetDefaultRequestContext();
 
   PluginService::GetInstance()->resource_dispatcher_host()->
       BeginRequest(this, ChildProcessInfo::PLUGIN_PROCESS, handle(),
-                   -1, MSG_ROUTING_CONTROL, request_id,
+                   pid(), MSG_ROUTING_CONTROL, request_id,
                    request, context, sync_result);
 }
 
 void PluginProcessHost::OnGetCookies(uint32 request_context,
                                      const GURL& url,
                                      std::string* cookies) {
   URLRequestContext* context = CPBrowsingContextManager::Instance()->
         ToURLRequestContext(request_context);
   // TODO(mpcomplete): remove fallback case when Gears support is prevalent.
   if (!context)
@@ skipping 33 matching lines @@
 
 void PluginProcessHost::RequestPluginChannel(
     ResourceMessageFilter* renderer_message_filter,
     const std::string& mime_type, IPC::Message* reply_msg) {
 #if defined(OS_WIN)
   // We can't send any sync messages from the browser because it might lead to
   // a hang.  However this async messages must be answered right away by the
   // plugin process (i.e. unblocks a Send() call like a sync message) otherwise
   // a deadlock can occur if the plugin creation request from the renderer is
   // a result of a sync message by the plugin process.
-
-  // The plugin process expects to receive a handle to the renderer requesting
-  // the channel. The handle has to be valid in the plugin process.
-  HANDLE renderer_handle = NULL;
-  BOOL result = DuplicateHandle(GetCurrentProcess(),
-                                renderer_message_filter->renderer_handle(),
-                                handle(), &renderer_handle, 0, FALSE,
-                                DUPLICATE_SAME_ACCESS);
-  DCHECK(result);
-
-  PluginProcessMsg_CreateChannel* msg =
-      new PluginProcessMsg_CreateChannel(
-          renderer_message_filter->render_process_host_id(), renderer_handle);
+  PluginProcessMsg_CreateChannel* msg = new PluginProcessMsg_CreateChannel();
   msg->set_unblock(true);
   if (Send(msg)) {
-    sent_requests_.push_back(ChannelRequest(renderer_message_filter, mime_type,
-                             reply_msg));
+    sent_requests_.push(ChannelRequest(
+        renderer_message_filter, mime_type, reply_msg));
   } else {
     ReplyToRenderer(renderer_message_filter, std::wstring(), FilePath(),
                     reply_msg);
   }
 #else
   // TODO(port): Figure out what the plugin process is expecting in this case.
   NOTIMPLEMENTED();
 #endif
 }
 
-void PluginProcessHost::OnChannelCreated(int process_id,
-                                         const std::wstring& channel_name) {
-  for (size_t i = 0; i < sent_requests_.size(); ++i) {
-    if (sent_requests_[i].renderer_message_filter_->render_process_host_id()
-        == process_id) {
-      ReplyToRenderer(sent_requests_[i].renderer_message_filter_.get(),
-                      channel_name,
-                      info_.path,
-                      sent_requests_[i].reply_msg);
-
-      sent_requests_.erase(sent_requests_.begin() + i);
-      return;
-    }
-  }
-
-  NOTREACHED();
+void PluginProcessHost::OnChannelCreated(const std::wstring& channel_name) {
+  ReplyToRenderer(sent_requests_.front().renderer_message_filter_.get(),
+                  channel_name,
+                  info_.path,
+                  sent_requests_.front().reply_msg);
+  sent_requests_.pop();
 }
 
 void PluginProcessHost::OnDownloadUrl(const std::string& url,
                                       int source_pid,
                                       gfx::NativeWindow caller_window) {
   PluginDownloadUrlHelper* download_url_helper =
       new PluginDownloadUrlHelper(url, source_pid, caller_window);
   download_url_helper->InitiateDownload();
 }
 
@@ skipping 37 matching lines @@
 }
 
 void PluginProcessHost::Shutdown() {
 #if defined(OS_WIN)
   Send(new PluginProcessMsg_BrowserShutdown);
 #else
   // TODO(port): Port plugin_messages_internal.h.
   NOTIMPLEMENTED();
 #endif
 }