PPAPI: Make blocking completion callbacks work.

ppapi/shared_impl/ppb_audio_input_shared.h

 // Copyright (c) 2012 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 PPAPI_SHARED_IMPL_PPB_AUDIO_INPUT_SHARED_H_
 #define PPAPI_SHARED_IMPL_PPB_AUDIO_INPUT_SHARED_H_
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/ref_counted.h"
@@ skipping 23 matching lines @@
   // Used by the impl.
   explicit PPB_AudioInput_Shared(PP_Instance instance);
   virtual ~PPB_AudioInput_Shared();
 
   // Resource overrides.
   virtual thunk::PPB_AudioInput_API* AsPPB_AudioInput_API() OVERRIDE;
 
   // Implementation of PPB_AudioInput_API non-trusted methods.
   virtual int32_t EnumerateDevices(
       PP_Resource* devices,
-      const PP_CompletionCallback& callback) OVERRIDE;
+      ApiCallbackType callback) OVERRIDE;
   virtual int32_t Open(const std::string& device_id,
                        PP_Resource config,
                        PPB_AudioInput_Callback audio_input_callback,
                        void* user_data,
-                       const PP_CompletionCallback& callback) OVERRIDE;
+                       ApiCallbackType callback) OVERRIDE;
   virtual PP_Resource GetCurrentConfig() OVERRIDE;
   virtual PP_Bool StartCapture() OVERRIDE;
   virtual PP_Bool StopCapture() OVERRIDE;
   virtual void Close() OVERRIDE;
 
   void OnEnumerateDevicesComplete(int32_t result,
                                   const std::vector<DeviceRefData>& devices);
   void OnOpenComplete(int32_t result,
                       base::SharedMemoryHandle shared_memory_handle,
                       size_t shared_memory_size,
                       base::SyncSocket::Handle socket_handle);
 
-  static PP_CompletionCallback MakeIgnoredCompletionCallback();
+  static ApiCallbackType MakeIgnoredCompletionCallback(Resource* resource);
 
  protected:
   enum OpenState {
     BEFORE_OPEN,
     OPENED,
     CLOSED
   };
 
   // Subclasses should implement these methods to do impl- and proxy-specific
   // work.
   virtual int32_t InternalEnumerateDevices(PP_Resource* devices,
-                                           PP_CompletionCallback callback) = 0;
+                                           ApiCallbackType callback) = 0;
   virtual int32_t InternalOpen(const std::string& device_id,
                                PP_AudioSampleRate sample_rate,
                                uint32_t sample_frame_count,
-                               PP_CompletionCallback callback) = 0;
+                               ApiCallbackType callback) = 0;
   virtual PP_Bool InternalStartCapture() = 0;
   virtual PP_Bool InternalStopCapture() = 0;
   virtual void InternalClose() = 0;
 
   // Configures the current state to be capturing or not. The caller is
   // responsible for ensuring the new state is the opposite of the current one.
   //
   // This is the implementation for PPB_AudioInput.Start/StopCapture, except
   // that it does not actually notify the audio system to stop capture, it just
   // configures our object to stop generating callbacks. The actual stop
@@ skipping 18 matching lines @@
   // The common implementation of OpenTrusted() and Open(). It will call
   // InternalOpen() to do impl- and proxy-specific work.
   // OpenTrusted() will call this methods with a NULL |audio_input_callback|,
   // in this case, the thread will not be run. This non-callback mode is used in
   // the renderer with the proxy, since the proxy handles the callback entirely
   // within the plugin process.
   int32_t CommonOpen(const std::string& device_id,
                      PP_Resource config,
                      PPB_AudioInput_Callback audio_input_callback,
                      void* user_data,
-                     PP_CompletionCallback callback);
+                     ApiCallbackType callback);
 
   OpenState open_state_;
 
   // True if capturing the stream.
   bool capturing_;
 
   // Socket used to notify us when new samples are available. This pointer is
   // created in SetStreamInfo().
   scoped_ptr<base::SyncSocket> socket_;
 
@@ skipping 26 matching lines @@
   PP_Resource* devices_;
 
   ResourceObjectType resource_object_type_;
 
   DISALLOW_COPY_AND_ASSIGN(PPB_AudioInput_Shared);
 };
 
 }  // namespace ppapi
 
 #endif  // PPAPI_SHARED_IMPL_PPB_AUDIO_INPUT_SHARED_H_