Replace RTCErrorCallback with RTCPeerConnectionErrorCallback.

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

Index: third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.cpp
diff --git a/third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.cpp b/third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.cpp
index c4676c65d394dbc207eda1becb54a9499dd59043..35f5cafd0ce9045d4f1674551412b8a729e16b2c 100644
--- a/third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.cpp
+++ b/third_party/WebKit/Source/modules/mediastream/RTCSessionDescriptionRequestImpl.cpp
@@ -30,8 +30,10 @@
 
 #include "modules/mediastream/RTCSessionDescriptionRequestImpl.h"
 
-#include "modules/mediastream/RTCErrorCallback.h"
+#include "core/dom/DOMException.h"
+#include "core/dom/ExceptionCode.h"
 #include "modules/mediastream/RTCPeerConnection.h"
+#include "modules/mediastream/RTCPeerConnectionErrorCallback.h"
 #include "modules/mediastream/RTCSessionDescription.h"
 #include "modules/mediastream/RTCSessionDescriptionCallback.h"
 #include "public/platform/WebRTCSessionDescription.h"
@@ -39,16 +41,13 @@
 
 namespace blink {
 
-RTCSessionDescriptionRequestImpl* RTCSessionDescriptionRequestImpl::create(ExecutionContext* context, RTCPeerConnection* requester, RTCSessionDescriptionCallback* successCallback, RTCErrorCallback* errorCallback)
+RTCSessionDescriptionRequestImpl* RTCSessionDescriptionRequestImpl::create(RTCPeerConnection* requester, RTCSessionDescriptionCallback* successCallback, RTCPeerConnectionErrorCallback* errorCallback)
 {
-    RTCSessionDescriptionRequestImpl* request = new RTCSessionDescriptionRequestImpl(context, requester, successCallback, errorCallback);
-    request->suspendIfNeeded();
-    return request;
+    return new RTCSessionDescriptionRequestImpl(requester, successCallback, errorCallback);
 }
 
-RTCSessionDescriptionRequestImpl::RTCSessionDescriptionRequestImpl(ExecutionContext* context, RTCPeerConnection* requester, RTCSessionDescriptionCallback* successCallback, RTCErrorCallback* errorCallback)
-    : ActiveDOMObject(context)
-    , m_successCallback(successCallback)
+RTCSessionDescriptionRequestImpl::RTCSessionDescriptionRequestImpl(RTCPeerConnection* requester, RTCSessionDescriptionCallback* successCallback, RTCPeerConnectionErrorCallback* errorCallback)
+    : m_successCallback(successCallback)
     , m_errorCallback(errorCallback)
     , m_requester(requester)
 {
@@ -71,16 +70,11 @@ void RTCSessionDescriptionRequestImpl::requestFailed(const String& error)
 {
     bool shouldFireCallback = m_requester ? m_requester->shouldFireDefaultCallbacks() : false;
     if (shouldFireCallback && m_errorCallback)
-        m_errorCallback->handleEvent(error);
+        m_errorCallback->handleEvent(DOMException::create(OperationError, error));
 
     clear();
 }
 
-void RTCSessionDescriptionRequestImpl::stop()
-{
-    clear();
-}
-
 void RTCSessionDescriptionRequestImpl::clear()
 {
     m_successCallback.clear();
@@ -94,7 +88,6 @@ DEFINE_TRACE(RTCSessionDescriptionRequestImpl)
     visitor->trace(m_errorCallback);
     visitor->trace(m_requester);
     RTCSessionDescriptionRequest::trace(visitor);
-    ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink