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

chrome/browser/extensions/extension_renderer_state.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_EXTENSION_RENDERER_STATE_H_
 #define CHROME_BROWSER_EXTENSIONS_EXTENSION_RENDERER_STATE_H_
 
 #include <map>
 #include <set>
 #include <string>
 #include <utility>
 
 #include "base/basictypes.h"
 #include "base/memory/singleton.h"
 
 class WebViewGuest;
 
+namespace content {
+class ResourceRequestInfo;
+}
+
 // This class keeps track of renderer state for use on the IO thread. All
 // methods should be called on the IO thread except for Init and Shutdown.
 class ExtensionRendererState {
  public:
   struct WebViewInfo {
     int embedder_process_id;
     int instance_id;
     std::string partition_id;
     std::string extension_id;
     bool allow_chrome_extension_urls;
   };
 
   static ExtensionRendererState* GetInstance();
 
   // These are called on the UI thread to start and stop listening to tab
   // notifications.
   void Init();
   void Shutdown();
 
   // Looks up the information for the embedder <webview> for a given render
   // view, if one exists. Called on the IO thread.
   bool GetWebViewInfo(int guest_process_id, int guest_routing_id,
                       WebViewInfo* webview_info);
 
-  // Looks up the tab and window ID for a given render view. Returns true
-  // if we have the IDs in our map. Called on the IO thread.
+  // Looks up the tab and window ID for a given request. Returns true if we have
+  // the IDs in our map. Called on the IO thread.
   bool 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);
 
   // Returns true if the given renderer is used by webviews.
   bool IsWebViewRenderer(int render_process_id);
 
  private:
   class RenderViewHostObserver;
   class TabObserver;
   friend class TabObserver;
   friend class WebViewGuest;
   friend struct DefaultSingletonTraits<ExtensionRendererState>;
@@ skipping 18 matching lines @@
   void RemoveWebView(int render_process_host_id, int routing_id);
 
   TabObserver* observer_;
   TabAndWindowIdMap map_;
   WebViewInfoMap webview_info_map_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionRendererState);
 };
 
 #endif  // CHROME_BROWSER_EXTENSIONS_EXTENSION_RENDERER_STATE_H_