Replace RTCErrorCallback with RTCPeerConnectionErrorCallback.

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

Index: third_party/WebKit/Source/modules/mediastream/RTCVoidRequestImpl.cpp
diff --git a/third_party/WebKit/Source/modules/mediastream/RTCVoidRequestImpl.cpp b/third_party/WebKit/Source/modules/mediastream/RTCVoidRequestImpl.cpp
index 9117a58a55d0dd04ffae875fc02090dcaa5fa22b..9d5a8b106b3d62df7a48fa78e5113aea3bc6a364 100644
--- a/third_party/WebKit/Source/modules/mediastream/RTCVoidRequestImpl.cpp
+++ b/third_party/WebKit/Source/modules/mediastream/RTCVoidRequestImpl.cpp
@@ -30,23 +30,22 @@
 
 #include "modules/mediastream/RTCVoidRequestImpl.h"
 
+#include "core/dom/DOMException.h"
 #include "core/html/VoidCallback.h"
-#include "modules/mediastream/RTCErrorCallback.h"
 #include "modules/mediastream/RTCPeerConnection.h"
+#include "modules/mediastream/RTCPeerConnectionErrorCallback.h"
 
 namespace blink {
 
-RTCVoidRequestImpl* RTCVoidRequestImpl::create(ExecutionContext* context, RTCPeerConnection* requester, VoidCallback* successCallback, RTCErrorCallback* errorCallback)
+RTCVoidRequestImpl* RTCVoidRequestImpl::create(RTCPeerConnection* requester, VoidCallback* successCallback, RTCPeerConnectionErrorCallback* errorCallback, ExceptionCode exceptionCode)
 {
-    RTCVoidRequestImpl* request = new RTCVoidRequestImpl(context, requester, successCallback, errorCallback);
-    request->suspendIfNeeded();
-    return request;
+    return new RTCVoidRequestImpl(requester, successCallback, errorCallback, exceptionCode);
 }
 
-RTCVoidRequestImpl::RTCVoidRequestImpl(ExecutionContext* context, RTCPeerConnection* requester, VoidCallback* successCallback, RTCErrorCallback* errorCallback)
-    : ActiveDOMObject(context)
-    , m_successCallback(successCallback)
+RTCVoidRequestImpl::RTCVoidRequestImpl(RTCPeerConnection* requester, VoidCallback* successCallback, RTCPeerConnectionErrorCallback* errorCallback, ExceptionCode exceptionCode)
+    : m_successCallback(successCallback)
     , m_errorCallback(errorCallback)
+    , m_exceptionCode(exceptionCode)
     , m_requester(requester)
 {
     ASSERT(m_requester);
@@ -58,7 +57,7 @@ RTCVoidRequestImpl::~RTCVoidRequestImpl()
 
 void RTCVoidRequestImpl::requestSucceeded()
 {
-    bool shouldFireCallback = m_requester ? m_requester->shouldFireDefaultCallbacks() : false;
+    bool shouldFireCallback = m_requester && m_requester->shouldFireDefaultCallbacks();
     if (shouldFireCallback && m_successCallback)
         m_successCallback->handleEvent();
 
@@ -67,18 +66,13 @@ void RTCVoidRequestImpl::requestSucceeded()
 
 void RTCVoidRequestImpl::requestFailed(const String& error)
 {
-    bool shouldFireCallback = m_requester ? m_requester->shouldFireDefaultCallbacks() : false;
+    bool shouldFireCallback = m_requester && m_requester->shouldFireDefaultCallbacks();
     if (shouldFireCallback && m_errorCallback.get())
-        m_errorCallback->handleEvent(error);
+        m_errorCallback->handleEvent(DOMException::create(m_exceptionCode, error));
 
     clear();
 }
 
-void RTCVoidRequestImpl::stop()
-{
-    clear();
-}
-
 void RTCVoidRequestImpl::clear()
 {
     m_successCallback.clear();
@@ -92,7 +86,6 @@ DEFINE_TRACE(RTCVoidRequestImpl)
     visitor->trace(m_errorCallback);
     visitor->trace(m_requester);
     RTCVoidRequest::trace(visitor);
-    ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink