Replace RTCErrorCallback with RTCPeerConnectionErrorCallback.

third_party/WebKit/Source/modules/mediastream/RTCVoidRequestImpl.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 12 matching lines @@
  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
  * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
  * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
  * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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);
 }
 
 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();
 
     clear();
 }
 
 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();
     m_errorCallback.clear();
     m_requester.clear();
 }
 
 DEFINE_TRACE(RTCVoidRequestImpl)
 {
     visitor->trace(m_successCallback);
     visitor->trace(m_errorCallback);
     visitor->trace(m_requester);
     RTCVoidRequest::trace(visitor);
-    ActiveDOMObject::trace(visitor);
 }
 
 } // namespace blink