Add a template to handle properly issuing completion callbacks. This fixes

webkit/plugins/ppapi/ppb_audio_impl.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "webkit/plugins/ppapi/ppb_audio_impl.h"
 
 #include "base/logging.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/ppb_audio.h"
 #include "ppapi/c/ppb_audio_config.h"
 #include "ppapi/c/trusted/ppb_audio_trusted.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_audio_config_api.h"
 #include "ppapi/thunk/thunk.h"
 #include "webkit/plugins/ppapi/common.h"
 
+using ppapi::thunk::EnterResourceNoLock;
+using ppapi::thunk::PPB_Audio_API;
+using ppapi::thunk::PPB_AudioConfig_API;
+
 namespace webkit {
 namespace ppapi {
 
 // PPB_AudioConfig -------------------------------------------------------------
 
 PPB_AudioConfig_Impl::PPB_AudioConfig_Impl(PluginInstance* instance)
     : Resource(instance) {
 }
 
 PPB_AudioConfig_Impl::~PPB_AudioConfig_Impl() {
 }
 
 // static
 PP_Resource PPB_AudioConfig_Impl::Create(PluginInstance* instance,
                                          PP_AudioSampleRate sample_rate,
                                          uint32_t sample_frame_count) {
   scoped_refptr<PPB_AudioConfig_Impl> config(
       new PPB_AudioConfig_Impl(instance));
   if (!config->Init(sample_rate, sample_frame_count))
     return 0;
   return config->GetReference();
 }
 
-::ppapi::thunk::PPB_AudioConfig_API*
-PPB_AudioConfig_Impl::AsPPB_AudioConfig_API() {
+PPB_AudioConfig_API* PPB_AudioConfig_Impl::AsPPB_AudioConfig_API() {
   return this;
 }
 
 // PPB_Audio_Impl --------------------------------------------------------------
 
 PPB_Audio_Impl::PPB_Audio_Impl(PluginInstance* instance)
     : Resource(instance),
       config_id_(0),
       audio_(NULL),
       create_callback_pending_(false),
@@ skipping 27 matching lines @@
 PP_Resource PPB_Audio_Impl::Create(PluginInstance* instance,
                                    PP_Resource config_id,
                                    PPB_Audio_Callback audio_callback,
                                    void* user_data) {
   scoped_refptr<PPB_Audio_Impl> audio(new PPB_Audio_Impl(instance));
   if (!audio->Init(config_id, audio_callback, user_data))
     return 0;
   return audio->GetReference();
 }
 
-::ppapi::thunk::PPB_Audio_API* PPB_Audio_Impl::AsPPB_Audio_API() {
-  return this;
-}
-
-::ppapi::thunk::PPB_AudioTrusted_API* PPB_Audio_Impl::AsPPB_AudioTrusted_API() {
+PPB_Audio_API* PPB_Audio_Impl::AsPPB_Audio_API() {
   return this;
 }
 
 bool PPB_Audio_Impl::Init(PP_Resource config_id,
                           PPB_Audio_Callback callback, void* user_data) {
   // Validate the config and keep a reference to it.
-  ::ppapi::thunk::EnterResourceNoLock< ::ppapi::thunk::PPB_AudioConfig_API>
-      enter(config_id, true);
+  EnterResourceNoLock<PPB_AudioConfig_API> enter(config_id, true);
   if (enter.failed())
     return false;
   config_id_ = config_id;
   ResourceTracker::Get()->AddRefResource(config_id);
 
   if (!callback)
     return false;
   SetCallback(callback, user_data);
 
   // When the stream is created, we'll get called back on StreamCreated().
@@ skipping 28 matching lines @@
   if (!audio_->StopPlayback())
     return PP_FALSE;
   SetStopPlaybackState();
   return PP_TRUE;
 }
 
 int32_t PPB_Audio_Impl::OpenTrusted(PP_Resource config_id,
                                     PP_CompletionCallback create_callback) {
 
   // Validate the config and keep a reference to it.
-  ::ppapi::thunk::EnterResourceNoLock< ::ppapi::thunk::PPB_AudioConfig_API>
-      enter(config_id, true);
+  EnterResourceNoLock<PPB_AudioConfig_API> enter(config_id, true);
   if (enter.failed())
     return false;
   config_id_ = config_id;
   ResourceTracker::Get()->AddRefResource(config_id);
 
   // When the stream is created, we'll get called back on StreamCreated().
   DCHECK(!audio_);
   audio_ = instance()->delegate()->CreateAudio(
       enter.object()->GetSampleRate(),
       enter.object()->GetSampleFrameCount(),
@@ skipping 62 matching lines @@
     // something more elaborate like an ACK from the plugin or post a task to
     // the I/O thread and back, but this extra complexity doesn't seem worth it
     // just to clean up these handles faster.
   } else {
     SetStreamInfo(shared_memory_handle, shared_memory_size, socket_handle);
   }
 }
 
 }  // namespace ppapi
 }  // namespace webkit