Getting rid of more webview memory leaks.

extensions/browser/api/web_request/web_request_api.cc

Index: extensions/browser/api/web_request/web_request_api.cc
diff --git a/extensions/browser/api/web_request/web_request_api.cc b/extensions/browser/api/web_request/web_request_api.cc
index f6c75274dca5baff22e2f25a09487a06a1055474..836cae30b30b683eaae41e98c64a865e55511a81 100644
--- a/extensions/browser/api/web_request/web_request_api.cc
+++ b/extensions/browser/api/web_request/web_request_api.cc
@@ -1346,7 +1346,6 @@ void ExtensionWebRequestEventRouter::RemoveEventListener(
 
 void ExtensionWebRequestEventRouter::RemoveWebViewEventListeners(
     void* browser_context,
-    const std::string& extension_id,
     int embedder_process_id,
     int web_view_instance_id) {
   DCHECK_CURRENTLY_ON(BrowserThread::IO);
@@ -1370,7 +1369,7 @@ void ExtensionWebRequestEventRouter::RemoveWebViewEventListeners(
     for (const auto& listener : listeners_to_delete) {
       RemoveEventListenerOnIOThread(
           browser_context,
-          extension_id,
+          listener.extension_id,

[lazyboy, 2015/06/09 14:19:32]

This isn't equivalent to what it used to be, as I'm not too familiar
/w web request api's listeners, I'm not too comfortable with this
change.
Could this potentially clear more listeners that we intended to?

[paulmeyer, 2015/06/09 14:49:42]

As per our offline discussion, I'll leave this change in since I want to remove
all listeners with the matching embedder/view IDs, regardless of extension ID.

           listener.sub_event_name,
           listener.embedder_process_id,
           listener.web_view_instance_id);