Revert removal of AudioBufferCallback

third_party/WebKit/Source/modules/webaudio/BaseAudioContext.cpp

Index: third_party/WebKit/Source/modules/webaudio/BaseAudioContext.cpp
diff --git a/third_party/WebKit/Source/modules/webaudio/BaseAudioContext.cpp b/third_party/WebKit/Source/modules/webaudio/BaseAudioContext.cpp
index fc9ae96fb1de9bc74289cb8b80341f174ea73547..7e9161d6d717a93000ec1210e7492dd798c6f0ae 100644
--- a/third_party/WebKit/Source/modules/webaudio/BaseAudioContext.cpp
+++ b/third_party/WebKit/Source/modules/webaudio/BaseAudioContext.cpp
@@ -29,8 +29,6 @@
 #include "bindings/core/v8/ExceptionMessages.h"
 #include "bindings/core/v8/ExceptionState.h"
 #include "bindings/core/v8/ScriptPromiseResolver.h"
-#include "bindings/modules/v8/DecodeErrorCallback.h"
-#include "bindings/modules/v8/DecodeSuccessCallback.h"
 #include "core/dom/DOMException.h"
 #include "core/dom/Document.h"
 #include "core/dom/ExceptionCode.h"
@@ -42,6 +40,7 @@
 #include "modules/mediastream/MediaStream.h"
 #include "modules/webaudio/AnalyserNode.h"
 #include "modules/webaudio/AudioBuffer.h"
+#include "modules/webaudio/AudioBufferCallback.h"
 #include "modules/webaudio/AudioBufferSourceNode.h"
 #include "modules/webaudio/AudioContext.h"
 #include "modules/webaudio/AudioListener.h"
@@ -273,25 +272,8 @@ AudioBuffer* BaseAudioContext::createBuffer(unsigned number_of_channels,
 ScriptPromise BaseAudioContext::decodeAudioData(
     ScriptState* script_state,
     DOMArrayBuffer* audio_data,
-    ExceptionState& exception_state) {
-  return decodeAudioData(script_state, audio_data, nullptr, nullptr,
-                         exception_state);
-}
-
-ScriptPromise BaseAudioContext::decodeAudioData(
-    ScriptState* script_state,
-    DOMArrayBuffer* audio_data,
-    DecodeSuccessCallback* success_callback,
-    ExceptionState& exception_state) {
-  return decodeAudioData(script_state, audio_data, success_callback, nullptr,
-                         exception_state);
-}
-
-ScriptPromise BaseAudioContext::decodeAudioData(
-    ScriptState* script_state,
-    DOMArrayBuffer* audio_data,
-    DecodeSuccessCallback* success_callback,
-    DecodeErrorCallback* error_callback,
+    AudioBufferCallback* success_callback,
+    AudioBufferCallback* error_callback,
     ExceptionState& exception_state) {
   DCHECK(IsMainThread());
   DCHECK(audio_data);
@@ -321,7 +303,7 @@ ScriptPromise BaseAudioContext::decodeAudioData(
         kDataCloneError, "Cannot decode detached ArrayBuffer");
     resolver->Reject(error);
     if (error_callback) {
-      error_callback->call(this, error);
+      error_callback->handleEvent(error);
     }
   }
 
@@ -331,22 +313,22 @@ ScriptPromise BaseAudioContext::decodeAudioData(
 void BaseAudioContext::HandleDecodeAudioData(
     AudioBuffer* audio_buffer,
     ScriptPromiseResolver* resolver,
-    DecodeSuccessCallback* success_callback,
-    DecodeErrorCallback* error_callback) {
+    AudioBufferCallback* success_callback,
+    AudioBufferCallback* error_callback) {
   DCHECK(IsMainThread());
 
   if (audio_buffer) {
     // Resolve promise successfully and run the success callback
     resolver->Resolve(audio_buffer);
     if (success_callback)
-      success_callback->call(this, audio_buffer);
+      success_callback->handleEvent(audio_buffer);
   } else {
     // Reject the promise and run the error callback
     DOMException* error =
         DOMException::Create(kEncodingError, "Unable to decode audio data");
     resolver->Reject(error);
     if (error_callback)
-      error_callback->call(this, error);
+      error_callback->handleEvent(error);
   }
 
   // We've resolved the promise.  Remove it now.