Fixes a leak of WebRTCIdentityRequestHandle when WebRTCIdentityStoreBackend::FindIdentity returns f…

content/browser/media/webrtc_identity_store.cc

 // Copyright 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 "content/browser/media/webrtc_identity_store.h"
 
 #include <map>
 
 #include "base/bind.h"
 #include "base/callback_helpers.h"
@@ skipping 169 matching lines @@
       backend_(new WebRTCIdentityStoreBackend(path, policy)) {}
 
 WebRTCIdentityStore::~WebRTCIdentityStore() { backend_->Close(); }
 
 base::Closure WebRTCIdentityStore::RequestIdentity(
     const GURL& origin,
     const std::string& identity_name,
     const std::string& common_name,
     const CompletionCallback& callback) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-
-  WebRTCIdentityRequestHandle* handle =
-      new WebRTCIdentityRequestHandle(this, callback);
-
   WebRTCIdentityRequest* request =
       FindRequest(origin, identity_name, common_name);
-
   // If there is no identical request in flight, create a new one, queue it,
   // and make the backend request.
   if (!request) {
-    request = new WebRTCIdentityRequest(origin, identity_name, common_name);
+    scoped_ptr<WebRTCIdentityRequest> new_request(
+        new WebRTCIdentityRequest(origin, identity_name, common_name));
 
     if (!backend_->FindIdentity(
             origin,
             identity_name,
             common_name,
             base::Bind(
-                &WebRTCIdentityStore::BackendFindCallback, this, request))) {
-      delete request;
+                &WebRTCIdentityStore::BackendFindCallback,
+                this, new_request.get()))) {
       return base::Closure();
     }
+    // |request| will delete itself after the result is posted.
+    request = new_request.release();

[Ami GONE FROM CHROMIUM, 2013/08/12 17:56:34]

TBH I think the old code made it easier to see how no requests would be leaked
than the new code, but I don't feel strongly about it.

If you want to keep the new code I suggest you drop this use of |request| and
instead:
in_flight_requests_.push_back(new_request.release());

     in_flight_requests_.push_back(request);
   }
 
+  WebRTCIdentityRequestHandle* handle =
+    new WebRTCIdentityRequestHandle(this, callback);
   request->AddCallback(
       handle,
       base::Bind(&WebRTCIdentityRequestHandle::OnRequestComplete,
                  base::Owned(handle)));
   handle->OnRequestStarted(request);
   return base::Bind(&WebRTCIdentityRequestHandle::Cancel,
                     base::Unretained(handle));
 }
 
 void WebRTCIdentityStore::DeleteBetween(base::Time delete_begin,
@@ skipping 75 matching lines @@
     if (in_flight_requests_[i]->origin_ == origin &&
         in_flight_requests_[i]->identity_name_ == identity_name &&
         in_flight_requests_[i]->common_name_ == common_name) {
       return in_flight_requests_[i];
     }
   }
   return NULL;
 }
 
 }  // namespace content