Pass PP_CompletionCallback by reference

CID=103456,103502,103503
BUG=none
TEST=none


Review URL: http://codereview.chromium.org/9861034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@129369 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 24 insertions, 19 deletions

diff --git a/ppapi/proxy/ppb_audio_input_proxy.cc b/ppapi/proxy/ppb_audio_input_proxy.cc
index 79d6eba..32aa6b7 100644
--- a/ppapi/proxy/ppb_audio_input_proxy.cc
+++ b/ppapi/proxy/ppb_audio_input_proxy.cc
@@ -33,9 +33,10 @@ class AudioInput : public PPB_AudioInput_Shared {
   virtual ~AudioInput();
 
   // Implementation of PPB_AudioInput_API trusted methods.
-  virtual int32_t OpenTrusted(const std::string& device_id,
-                              PP_Resource config,
-                              PP_CompletionCallback create_callback) OVERRIDE;
+  virtual int32_t OpenTrusted(
+      const std::string& device_id,
+      PP_Resource config,
+      const 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;
   virtual const std::vector<DeviceRefData>& GetDeviceRefData() const OVERRIDE;
@@ -70,7 +71,7 @@ AudioInput::~AudioInput() {
 
 int32_t AudioInput::OpenTrusted(const std::string& device_id,
                                 PP_Resource config,
-                                PP_CompletionCallback create_callback) {
+                                const PP_CompletionCallback& create_callback) {
   return PP_ERROR_NOTSUPPORTED;  // Don't proxy the trusted interface.
 }
 
diff --git a/ppapi/shared_impl/ppb_audio_input_shared.cc b/ppapi/shared_impl/ppb_audio_input_shared.cc
index 9af25a9..eb210b5 100644
--- a/ppapi/shared_impl/ppb_audio_input_shared.cc
+++ b/ppapi/shared_impl/ppb_audio_input_shared.cc
@@ -54,7 +54,7 @@ thunk::PPB_AudioInput_API* PPB_AudioInput_Shared::AsPPB_AudioInput_API() {
 
 int32_t PPB_AudioInput_Shared::EnumerateDevices(
     PP_Resource* devices,
-    PP_CompletionCallback callback) {
+    const PP_CompletionCallback& callback) {
   if (!callback.func)
     return PP_ERROR_BLOCKS_MAIN_THREAD;
   if (TrackedCallback::IsPending(enumerate_devices_callback_))
@@ -68,7 +68,7 @@ int32_t PPB_AudioInput_Shared::Open(
     PP_Resource config,
     PPB_AudioInput_Callback audio_input_callback,
     void* user_data,
-    PP_CompletionCallback callback) {
+    const PP_CompletionCallback& callback) {
   if (!audio_input_callback)
     return PP_ERROR_BADARGUMENT;
 
diff --git a/ppapi/shared_impl/ppb_audio_input_shared.h b/ppapi/shared_impl/ppb_audio_input_shared.h
index 5d44ddc..a354614 100644
--- a/ppapi/shared_impl/ppb_audio_input_shared.h
+++ b/ppapi/shared_impl/ppb_audio_input_shared.h
@@ -39,13 +39,14 @@ class PPAPI_SHARED_EXPORT PPB_AudioInput_Shared
   virtual thunk::PPB_AudioInput_API* AsPPB_AudioInput_API() OVERRIDE;
 
   // Implementation of PPB_AudioInput_API non-trusted methods.
-  virtual int32_t EnumerateDevices(PP_Resource* devices,
-                                   PP_CompletionCallback callback) OVERRIDE;
+  virtual int32_t EnumerateDevices(
+      PP_Resource* devices,
+      const PP_CompletionCallback& callback) OVERRIDE;
   virtual int32_t Open(const std::string& device_id,
                        PP_Resource config,
                        PPB_AudioInput_Callback audio_input_callback,
                        void* user_data,
-                       PP_CompletionCallback callback) OVERRIDE;
+                       const PP_CompletionCallback& callback) OVERRIDE;
   virtual PP_Resource GetCurrentConfig() OVERRIDE;
   virtual PP_Bool StartCapture() OVERRIDE;
   virtual PP_Bool StopCapture() OVERRIDE;
diff --git a/ppapi/thunk/ppb_audio_input_api.h b/ppapi/thunk/ppb_audio_input_api.h
index 68c8b94..38e94ef 100644
--- a/ppapi/thunk/ppb_audio_input_api.h
+++ b/ppapi/thunk/ppb_audio_input_api.h
@@ -22,22 +22,24 @@ class PPAPI_THUNK_EXPORT PPB_AudioInput_API {
  public:
   virtual ~PPB_AudioInput_API() {}
 
-  virtual int32_t EnumerateDevices(PP_Resource* devices,
-                                   PP_CompletionCallback callback) = 0;
+  virtual int32_t EnumerateDevices(
+      PP_Resource* devices,
+      const PP_CompletionCallback& callback) = 0;
   virtual int32_t Open(const std::string& device_id,
                        PP_Resource config,
                        PPB_AudioInput_Callback audio_input_callback,
                        void* user_data,
-                       PP_CompletionCallback callback) = 0;
+                       const PP_CompletionCallback& callback) = 0;
   virtual PP_Resource GetCurrentConfig() = 0;
   virtual PP_Bool StartCapture() = 0;
   virtual PP_Bool StopCapture() = 0;
   virtual void Close() = 0;
 
   // Trusted API.
-  virtual int32_t OpenTrusted(const std::string& device_id,
-                              PP_Resource config,
-                              PP_CompletionCallback create_callback) = 0;
+  virtual int32_t OpenTrusted(
+      const std::string& device_id,
+      PP_Resource config,
+      const PP_CompletionCallback& create_callback) = 0;
   virtual int32_t GetSyncSocket(int* sync_socket) = 0;
   virtual int32_t GetSharedMemory(int* shm_handle, uint32_t* shm_size) = 0;
   virtual const std::vector<DeviceRefData>& GetDeviceRefData() const = 0;
diff --git a/webkit/plugins/ppapi/ppb_audio_input_impl.cc b/webkit/plugins/ppapi/ppb_audio_input_impl.cc
index d7df0c1..fe1036d 100644
--- a/webkit/plugins/ppapi/ppb_audio_input_impl.cc
+++ b/webkit/plugins/ppapi/ppb_audio_input_impl.cc
@@ -51,7 +51,7 @@ PP_Resource PPB_AudioInput_Impl::Create0_1(
 int32_t PPB_AudioInput_Impl::OpenTrusted(
     const std::string& device_id,
     PP_Resource config,
-    PP_CompletionCallback create_callback) {
+    const PP_CompletionCallback& create_callback) {
   return CommonOpen(device_id, config, NULL, NULL, create_callback);
 }
 
diff --git a/webkit/plugins/ppapi/ppb_audio_input_impl.h b/webkit/plugins/ppapi/ppb_audio_input_impl.h
index bc4329e..186a148 100644
--- a/webkit/plugins/ppapi/ppb_audio_input_impl.h
+++ b/webkit/plugins/ppapi/ppb_audio_input_impl.h
@@ -36,9 +36,10 @@ class PPB_AudioInput_Impl : public ::ppapi::PPB_AudioInput_Shared,
                                void* user_data);
 
   // Implementation of PPB_AudioInput_API trusted methods.
-  virtual int32_t OpenTrusted(const std::string& device_id,
-                              PP_Resource config,
-                              PP_CompletionCallback create_callback) OVERRIDE;
+  virtual int32_t OpenTrusted(
+      const std::string& device_id,
+      PP_Resource config,
+      const 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;
   virtual const DeviceRefDataVector& GetDeviceRefData() const OVERRIDE;