Fix chrome.webRequest.onBeforeRequest for requests coming from NPAPI plugin processes.

chrome/browser/extensions/extension_renderer_state.cc

 // Copyright (c) 2013 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/extension_renderer_state.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
 #include "chrome/browser/tab_contents/retargeting_details.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/navigation_details.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
+#include "content/public/browser/resource_request_info.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
+#include "content/public/common/process_type.h"
 
 using content::BrowserThread;
 using content::RenderProcessHost;
 using content::RenderViewHost;
 using content::WebContents;
 
 //
 // ExtensionRendererState::RenderViewHostObserver
 //
 
@@ skipping 161 matching lines @@
 }
 
 void ExtensionRendererState::ClearTabAndWindowId(
     int render_process_host_id, int routing_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   RenderId render_id(render_process_host_id, routing_id);
   map_.erase(render_id);
 }
 
 bool ExtensionRendererState::GetTabAndWindowId(
-    int render_process_host_id, int routing_id, int* tab_id, int* window_id) {
+    const  content::ResourceRequestInfo* info, int* tab_id, int* window_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  RenderId render_id(render_process_host_id, routing_id);
+  int render_process_id;
+  if (info->GetProcessType() == content::PROCESS_TYPE_PLUGIN) {
+    render_process_id = info->GetOriginPID();
+  } else {
+    render_process_id = info->GetChildID();
+  }
+  int render_view_id = info->GetRouteID();
+  RenderId render_id(render_process_id, render_view_id);
   TabAndWindowIdMap::iterator iter = map_.find(render_id);
   if (iter != map_.end()) {
     *tab_id = iter->second.first;
     *window_id = iter->second.second;
     return true;
   }
   return false;
 }
 
 bool ExtensionRendererState::IsWebViewRenderer(int render_process_id) {
@@ skipping 26 matching lines @@
                                             WebViewInfo* webview_info) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
   RenderId render_id(guest_process_id, guest_routing_id);
   WebViewInfoMap::iterator iter = webview_info_map_.find(render_id);
   if (iter != webview_info_map_.end()) {
     *webview_info = iter->second;
     return true;
   }
   return false;
 }