Getting rid of more webview memory leaks.

extensions/browser/api/web_request/web_request_api.cc

 // Copyright (c) 2012 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 "extensions/browser/api/web_request/web_request_api.h"
 
 #include <algorithm>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 1328 matching lines @@
     DecrementBlockCount(browser_context, extension_id, event_name, *it, NULL);
   }
 
   event_listeners.erase(listener);
 
   helpers::ClearCacheOnNavigation();
 }
 
 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);
 
   // Iterate over all listeners of all WebRequest events to delete
   // any listeners that belong to the provided <webview>.
   ListenerMapForBrowserContext& map_for_browser_context =
       listeners_[browser_context];
   for (const auto& event_iter : map_for_browser_context) {
     // Construct a listeners_to_delete vector so that we don't modify the set of
     // listeners as we iterate through it.
     std::vector<EventListener> listeners_to_delete;
     const std::set<EventListener>& listeners = event_iter.second;
     for (const auto& listener : listeners) {
       if (listener.embedder_process_id == embedder_process_id &&
           listener.web_view_instance_id == web_view_instance_id) {
         listeners_to_delete.push_back(listener);
       }
     }
     // Remove the listeners selected for deletion.
     for (const auto& listener : listeners_to_delete) {
       RemoveEventListenerOnIOThread(
           browser_context,
-          extension_id,
+          listener.extension_id,
           listener.sub_event_name,
           listener.embedder_process_id,
           listener.web_view_instance_id);
     }
   }
 }
 
 void ExtensionWebRequestEventRouter::OnOTRBrowserContextCreated(
     void* original_browser_context, void* otr_browser_context) {
   cross_browser_context_map_[original_browser_context] =
@@ skipping 1075 matching lines @@
       base::Bind(&WarningService::NotifyWarningsOnUI, profile_id(), warnings));
 
   // Continue gracefully.
   RunSync();
 }
 
 bool WebRequestHandlerBehaviorChangedFunction::RunSync() {
   helpers::ClearCacheOnNavigation();
   return true;
 }