Replace RTCErrorCallback with RTCPeerConnectionErrorCallback.

third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.h

Index: third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.h
diff --git a/third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.h b/third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.h
index 2e5b07324fa239155729110f4ab463136fa3ed43..00edf75038304468e56234a338ff8fbf6bc49055 100644
--- a/third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.h
+++ b/third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.h
@@ -31,7 +31,6 @@
 #ifndef RTCSessionDescriptionRequestImpl_h
 #define RTCSessionDescriptionRequestImpl_h
 
-#include "core/dom/ActiveDOMObject.h"
 #include "platform/heap/Handle.h"
 #include "platform/mediastream/RTCSessionDescriptionRequest.h"
 #include "wtf/PassOwnPtr.h"
@@ -39,32 +38,28 @@
 
 namespace blink {
 
-class RTCErrorCallback;
 class RTCPeerConnection;
+class RTCPeerConnectionErrorCallback;
 class RTCSessionDescriptionCallback;
 class WebRTCSessionDescription;
 
-class RTCSessionDescriptionRequestImpl final : public RTCSessionDescriptionRequest, public ActiveDOMObject {

[philipj_slow, 2016/02/24 08:14:03]

Is the ActiveDOMObject change made possible by this refactoring, or is it a
drive-by fix?

[Guido Urdaneta, 2016/02/24 12:42:10]

Reverted.

-    WILL_BE_USING_GARBAGE_COLLECTED_MIXIN(RTCSessionDescriptionRequestImpl);
+class RTCSessionDescriptionRequestImpl final : public RTCSessionDescriptionRequest {
 public:
-    static RTCSessionDescriptionRequestImpl* create(ExecutionContext*, RTCPeerConnection*, RTCSessionDescriptionCallback*, RTCErrorCallback*);
+    static RTCSessionDescriptionRequestImpl* create(RTCPeerConnection*, RTCSessionDescriptionCallback*, RTCPeerConnectionErrorCallback*);
     ~RTCSessionDescriptionRequestImpl() override;
 
     void requestSucceeded(const WebRTCSessionDescription&) override;
     void requestFailed(const String& error) override;
 
-    // ActiveDOMObject
-    void stop() override;
-
     DECLARE_VIRTUAL_TRACE();
 
 private:
-    RTCSessionDescriptionRequestImpl(ExecutionContext*, RTCPeerConnection*, RTCSessionDescriptionCallback*, RTCErrorCallback*);
+    RTCSessionDescriptionRequestImpl(RTCPeerConnection*, RTCSessionDescriptionCallback*, RTCPeerConnectionErrorCallback*);
 
     void clear();
 
     Member<RTCSessionDescriptionCallback> m_successCallback;
-    Member<RTCErrorCallback> m_errorCallback;
+    Member<RTCPeerConnectionErrorCallback> m_errorCallback;
     Member<RTCPeerConnection> m_requester;
 };