Index: ppapi/thunk/ppb_audio_trusted_thunk.cc |
diff --git a/ppapi/thunk/ppb_audio_trusted_thunk.cc b/ppapi/thunk/ppb_audio_trusted_thunk.cc |
index da49425412ee2d3bb7115aaffdeb3b1185e5b5a5..a990415341e6361501086da9316e4b057567e996 100644 |
--- a/ppapi/thunk/ppb_audio_trusted_thunk.cc |
+++ b/ppapi/thunk/ppb_audio_trusted_thunk.cc |
@@ -4,7 +4,6 @@ |
#include "ppapi/c/pp_errors.h" |
#include "ppapi/c/trusted/ppb_audio_trusted.h" |
-#include "ppapi/thunk/common.h" |
#include "ppapi/thunk/enter.h" |
#include "ppapi/thunk/thunk.h" |
#include "ppapi/thunk/ppb_audio_api.h" |
@@ -26,18 +25,17 @@ PP_Resource Create(PP_Instance instance_id) { |
int32_t Open(PP_Resource audio_id, |
PP_Resource config_id, |
- PP_CompletionCallback create_callback) { |
- EnterAudio enter(audio_id, true); |
+ PP_CompletionCallback callback) { |
+ EnterAudio enter(audio_id, callback, true); |
if (enter.failed()) |
- return MayForceCallback(create_callback, PP_ERROR_BADRESOURCE); |
- int32_t result = enter.object()->OpenTrusted(config_id, create_callback); |
- return MayForceCallback(create_callback, result); |
+ return enter.retval(); |
+ return enter.SetResult(enter.object()->OpenTrusted(config_id, callback)); |
} |
int32_t GetSyncSocket(PP_Resource audio_id, int* sync_socket) { |
EnterAudio enter(audio_id, true); |
if (enter.failed()) |
- return PP_ERROR_BADRESOURCE; |
+ return enter.retval(); |
return enter.object()->GetSyncSocket(sync_socket); |
} |
@@ -46,7 +44,7 @@ int32_t GetSharedMemory(PP_Resource audio_id, |
uint32_t* shm_size) { |
EnterAudio enter(audio_id, true); |
if (enter.failed()) |
- return PP_ERROR_BADRESOURCE; |
+ return enter.retval(); |
return enter.object()->GetSharedMemory(shm_handle, shm_size); |
} |