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

webkit/plugins/ppapi/ppb_audio_impl.h

 // 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.
 
 #ifndef WEBKIT_PLUGINS_PPAPI_PPB_AUDIO_IMPL_H_
 #define WEBKIT_PLUGINS_PPAPI_PPB_AUDIO_IMPL_H_
 
 #include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
 #include "base/shared_memory.h"
 #include "base/sync_socket.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/shared_impl/audio_config_impl.h"
 #include "ppapi/shared_impl/audio_impl.h"
-#include "ppapi/thunk/ppb_audio_trusted_api.h"
 #include "webkit/plugins/ppapi/plugin_delegate.h"
 #include "webkit/plugins/ppapi/ppapi_plugin_instance.h"
 #include "webkit/plugins/ppapi/resource.h"
 
 namespace webkit {
 namespace ppapi {
 
 class PluginInstance;
 
 // The implementation is actually in AudioConfigImpl.
@@ skipping 13 matching lines @@
  private:
   explicit PPB_AudioConfig_Impl(PluginInstance* instance);
 
   DISALLOW_COPY_AND_ASSIGN(PPB_AudioConfig_Impl);
 };
 
 // Some of the backend functionality of this class is implemented by the
 // AudioImpl so it can be shared with the proxy.
 class PPB_Audio_Impl : public Resource,
                        public ::ppapi::AudioImpl,
-                       public ::ppapi::thunk::PPB_AudioTrusted_API,
                        public PluginDelegate::PlatformAudio::Client {
  public:
   // Trusted initialization. You must call Init after this.
   //
   // Untrusted initialization should just call the static Create() function
   // to properly create & initialize this class.
   explicit PPB_Audio_Impl(PluginInstance* instance);
 
   virtual ~PPB_Audio_Impl();
 
   // Creation function for untrusted plugins. This handles all initialization
   // and will return 0 on failure.
   static PP_Resource Create(PluginInstance* instance,
                             PP_Resource config_id,
                             PPB_Audio_Callback audio_callback,
                             void* user_data);
 
   // Initialization function for non-trusted init.
   bool Init(PP_Resource config_id,
             PPB_Audio_Callback user_callback, void* user_data);
 
   // ResourceObjectBase overrides.
   virtual ::ppapi::thunk::PPB_Audio_API* AsPPB_Audio_API();
-  virtual ::ppapi::thunk::PPB_AudioTrusted_API* AsPPB_AudioTrusted_API();
 
   // PPB_Audio_API implementation.
   virtual PP_Resource GetCurrentConfig() OVERRIDE;
   virtual PP_Bool StartPlayback() OVERRIDE;
   virtual PP_Bool StopPlayback() OVERRIDE;
-
-  // PPB_AudioTrusted_API implementation.
   virtual int32_t OpenTrusted(PP_Resource config_id,
                               PP_CompletionCallback create_callback) OVERRIDE;
   virtual int32_t GetSyncSocket(int* sync_socket) OVERRIDE;
   virtual int32_t GetSharedMemory(int* shm_handle, uint32_t* shm_size) OVERRIDE;
 
  private:
   // PluginDelegate::PlatformAudio::Client implementation.
   virtual void StreamCreated(base::SharedMemoryHandle shared_memory_handle,
                              size_t shared_memory_size_,
                              base::SyncSocket::Handle socket);
@@ skipping 19 matching lines @@
   size_t shared_memory_size_for_create_callback_;
   scoped_ptr<base::SyncSocket> socket_for_create_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(PPB_Audio_Impl);
 };
 
 }  // namespace ppapi
 }  // namespace webkit
 
 #endif  // WEBKIT_PLUGINS_PPAPI_PPB_AUDIO_IMPL_H_