Extensions: Make ExtensionWebRequestEventRouter leaky.

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 b81023248535d3064adaf563327f06568d444b64..0451a519b07235a3f02c438f858f37f65b6494aa 100644
--- a/extensions/browser/api/web_request/web_request_api.cc
+++ b/extensions/browser/api/web_request/web_request_api.cc
@@ -563,7 +563,9 @@ ExtensionWebRequestEventRouter::RequestFilter::~RequestFilter() {
 
 // static
 ExtensionWebRequestEventRouter* ExtensionWebRequestEventRouter::GetInstance() {
-  return base::Singleton<ExtensionWebRequestEventRouter>::get();
+  static ExtensionWebRequestEventRouter* instance =

[Devlin, 2017/02/28 22:10:04]

nit: Let's use CR_DEFINE_STATIC_LOCAL() just so these are easy to trace.

[karandeepb, 2017/02/28 23:01:14]

Done.

+      new ExtensionWebRequestEventRouter();
+  return instance;
 }
 
 ExtensionWebRequestEventRouter::ExtensionWebRequestEventRouter()
@@ -571,9 +573,6 @@ ExtensionWebRequestEventRouter::ExtensionWebRequestEventRouter()
       web_request_event_router_delegate_(
           ExtensionsAPIClient::Get()->CreateWebRequestEventRouterDelegate()) {}
 
-ExtensionWebRequestEventRouter::~ExtensionWebRequestEventRouter() {
-}
-
 void ExtensionWebRequestEventRouter::RegisterRulesRegistry(
     void* browser_context,
     int rules_registry_id,
@@ -1108,9 +1107,10 @@ bool ExtensionWebRequestEventRouter::DispatchEvent(
     DispatchEventToListeners(browser_context, std::move(listeners_to_dispatch),
                              std::move(event_details));
   } else {
-    event_details.release()->DetermineFrameDataOnIO(base::Bind(
-        &ExtensionWebRequestEventRouter::DispatchEventToListeners, AsWeakPtr(),
-        browser_context, base::Passed(&listeners_to_dispatch)));
+    event_details.release()->DetermineFrameDataOnIO(
+        base::Bind(&ExtensionWebRequestEventRouter::DispatchEventToListeners,
+                   base::Unretained(this), browser_context,

[Devlin, 2017/02/28 22:10:04]

nit: when using Unretained, it's good practice to include a comment why it's
safe, e.g.
// This Unretained() is safe because this object is leaked.

[karandeepb, 2017/02/28 23:01:14]

Done.

+                   base::Passed(&listeners_to_dispatch)));
   }
 
   if (num_handlers_blocking > 0) {
@@ -1943,7 +1943,7 @@ bool ExtensionWebRequestEventRouter::ProcessDeclarativeRules(
     rules_registry->ready().Post(
         FROM_HERE,
         base::Bind(&ExtensionWebRequestEventRouter::OnRulesRegistryReady,
-                   AsWeakPtr(), browser_context, event_name,
+                   base::Unretained(this), browser_context, event_name,
                    request->identifier(), request_stage));
     BlockedRequest& blocked_request = blocked_requests_[request->identifier()];
     blocked_request.num_handlers_blocking++;