Refactor WebRTC certificate generation to use WebPassOwnPtr.

third_party/WebKit/Source/modules/mediastream/RTCPeerConnection.cpp

 /*
  * Copyright (C) 2012 Google Inc. All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  *
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
@@ skipping 122 matching lines @@
     if (candidate.isRTCIceCandidateInit()) {
         const RTCIceCandidateInit& iceCandidateInit = candidate.getAsRTCIceCandidateInit();
         return WebRTCICECandidate(iceCandidateInit.candidate(), iceCandidateInit.sdpMid(), iceCandidateInit.sdpMLineIndex());
     }
 
     ASSERT(candidate.isRTCIceCandidate());
     return candidate.getAsRTCIceCandidate()->webCandidate();
 }
 
 // Helper class for RTCPeerConnection::generateCertificate.
-class WebRTCCertificateObserver : public WebCallbacks<WebRTCCertificate*, void> {
+class WebRTCCertificateObserver : public WebRTCCertificateCallback {
 public:
-    // The created observer is responsible for deleting itself after onSuccess/onError. To avoid memory
-    // leak the observer should therefore be used in a WebRTCCertificateGenerator::generateCertificate call
-    // which is ensured to invoke one of these. Takes ownership of |resolver|.
+    // Takes ownership of |resolver|.
     static WebRTCCertificateObserver* create(ScriptPromiseResolver* resolver)
     {
         return new WebRTCCertificateObserver(resolver);
     }
 
+    ~WebRTCCertificateObserver() override {}
+
     DEFINE_INLINE_TRACE() { visitor->trace(m_resolver); }
 
 private:
     WebRTCCertificateObserver(ScriptPromiseResolver* resolver)
         : m_resolver(resolver) {}
 
-    ~WebRTCCertificateObserver() override {}
-
-    void onSuccess(WebRTCCertificate* certificate) override
+    void onSuccess(WebPassOwnPtr<WebRTCCertificate> certificate) override
     {
         m_resolver->resolve(new RTCCertificate(certificate));
-        delete this;
     }
 
     void onError() override
     {
         m_resolver->reject();
-        delete this;
     }
 
     Persistent<ScriptPromiseResolver> m_resolver;
 };
 
 } // namespace
 
 RTCPeerConnection::EventWrapper::EventWrapper(
     PassRefPtrWillBeRawPtr<Event> event,
     PassOwnPtr<BoolFunction> function)
@@ skipping 472 matching lines @@
         Platform::current()->createRTCCertificateGenerator());
 
     // |keyParams| was successfully constructed, but does the certificate generator support these parameters?
     if (!certificateGenerator->isSupportedKeyParams(keyParams.get())) {
         return ScriptPromise::rejectWithDOMException(scriptState, DOMException::create(NotSupportedError, unsupportedParamsString));
     }
 
     ScriptPromiseResolver* resolver = ScriptPromiseResolver::create(scriptState);
     ScriptPromise promise = resolver->promise();
 
-    WebRTCCertificateObserver* certificateObserver = WebRTCCertificateObserver::create(resolver);
+    WebPassOwnPtr<WebRTCCertificateObserver> certificateObserver = adoptWebPtr(WebRTCCertificateObserver::create(resolver));
 
     // Generate certificate. The |certificateObserver| will resolve the promise asynchronously upon completion.
     // The observer will manage its own destruction as well as the resolver's destruction.
     certificateGenerator->generateCertificate(
         keyParams.get(),
         toDocument(scriptState->getExecutionContext())->url(),
         toDocument(scriptState->getExecutionContext())->firstPartyForCookies(),
         certificateObserver);
 
     return promise;
@@ skipping 447 matching lines @@
 {
     visitor->trace(m_localStreams);
     visitor->trace(m_remoteStreams);
     visitor->trace(m_dispatchScheduledEventRunner);
     visitor->trace(m_scheduledEvents);
     RefCountedGarbageCollectedEventTargetWithInlineData<RTCPeerConnection>::trace(visitor);
     ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink