Make sure Blink WebRTCSessionDescriptionRequest and WebRTCVoidRequest are deleted on the correct th…

content/renderer/media/rtc_peer_connection_handler.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 "content/renderer/media/rtc_peer_connection_handler.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 244 matching lines @@
 
   void OnSuccess(webrtc::SessionDescriptionInterface* desc) override {
     if (!main_thread_->BelongsToCurrentThread()) {
       main_thread_->PostTask(FROM_HERE,
           base::Bind(&CreateSessionDescriptionRequest::OnSuccess, this, desc));
       return;
     }
 
     tracker_.TrackOnSuccess(desc);
     webkit_request_.requestSucceeded(CreateWebKitSessionDescription(desc));
+    webkit_request_.reset();
     delete desc;
   }
   void OnFailure(const std::string& error) override {
     if (!main_thread_->BelongsToCurrentThread()) {
       main_thread_->PostTask(FROM_HERE,
           base::Bind(&CreateSessionDescriptionRequest::OnFailure, this, error));
       return;
     }
 
     tracker_.TrackOnFailure(error);
     webkit_request_.requestFailed(base::UTF8ToUTF16(error));
+    webkit_request_.reset();
   }
 
  protected:
-  ~CreateSessionDescriptionRequest() override {}
+  ~CreateSessionDescriptionRequest() override {
+    DCHECK(webkit_request_.isNull());
+  }
 
   const scoped_refptr<base::SingleThreadTaskRunner> main_thread_;
   blink::WebRTCSessionDescriptionRequest webkit_request_;
   SessionDescriptionRequestTracker tracker_;
 };
 
 // Class mapping responses from calls to libjingle
 // SetLocalDescription/SetRemoteDescription and a blink::WebRTCVoidRequest.
 class SetSessionDescriptionRequest
     : public webrtc::SetSessionDescriptionObserver {
@@ skipping 10 matching lines @@
   }
 
   void OnSuccess() override {
     if (!main_thread_->BelongsToCurrentThread()) {
       main_thread_->PostTask(FROM_HERE,
           base::Bind(&SetSessionDescriptionRequest::OnSuccess, this));
       return;
     }
     tracker_.TrackOnSuccess(NULL);
     webkit_request_.requestSucceeded();
+    webkit_request_.reset();
   }
   void OnFailure(const std::string& error) override {
     if (!main_thread_->BelongsToCurrentThread()) {
       main_thread_->PostTask(FROM_HERE,
           base::Bind(&SetSessionDescriptionRequest::OnFailure, this, error));
       return;
     }
     tracker_.TrackOnFailure(error);
     webkit_request_.requestFailed(base::UTF8ToUTF16(error));
+    webkit_request_.reset();
   }
 
  protected:
-  ~SetSessionDescriptionRequest() override {}
+  ~SetSessionDescriptionRequest() override {
+    DCHECK(webkit_request_.isNull());
+  }
 
  private:
   const scoped_refptr<base::SingleThreadTaskRunner> main_thread_;
   blink::WebRTCVoidRequest webkit_request_;
   SessionDescriptionRequestTracker tracker_;
 };
 
 // Class mapping responses from calls to libjingle
 // GetStats into a blink::WebRTCStatsCallback.
 class StatsResponse : public webrtc::StatsObserver {
@@ skipping 1135 matching lines @@
     base::WaitableEvent event(false, false);
     thread->PostTask(FROM_HERE,
         base::Bind(&RunSynchronousClosure, closure,
                    base::Unretained(trace_event_name),
                    base::Unretained(&event)));
     event.Wait();
   }
 }
 
 }  // namespace content