Refactor some ResourceMessageReply usages.

content/renderer/pepper/pepper_audio_input_host.cc

 // 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.
 
 #include "content/renderer/pepper/pepper_audio_input_host.h"
 
 #include "base/logging.h"
 #include "build/build_config.h"
 #include "content/renderer/pepper/pepper_media_device_manager.h"
 #include "content/renderer/pepper/pepper_platform_audio_input.h"
@@ skipping 27 matching lines @@
 }
 
 }  // namespace
 
 PepperAudioInputHost::PepperAudioInputHost(
     RendererPpapiHostImpl* host,
     PP_Instance instance,
     PP_Resource resource)
     : ResourceHost(host->GetPpapiHost(), instance, resource),
       renderer_ppapi_host_(host),
+      open_pending_(false),
       audio_input_(NULL),
       enumeration_helper_(
           this,
           PepperMediaDeviceManager::GetForRenderView(
               host->GetRenderViewForInstance(pp_instance())),
           PP_DEVICETYPE_DEV_AUDIOCAPTURE,
           host->GetDocumentURL(instance)) {
 }
 
 PepperAudioInputHost::~PepperAudioInputHost() {
@@ skipping 27 matching lines @@
 void PepperAudioInputHost::StreamCreationFailed() {
   OnOpenComplete(PP_ERROR_FAILED, base::SharedMemory::NULLHandle(), 0,
                  base::SyncSocket::kInvalidHandle);
 }
 
 int32_t PepperAudioInputHost::OnOpen(
     ppapi::host::HostMessageContext* context,
     const std::string& device_id,
     PP_AudioSampleRate sample_rate,
     uint32_t sample_frame_count) {
-  if (open_context_)
+  if (open_pending_)
     return PP_ERROR_INPROGRESS;
   if (audio_input_)
     return PP_ERROR_FAILED;
 
   GURL document_url = renderer_ppapi_host_->GetDocumentURL(pp_instance());
   if (!document_url.is_valid())
     return PP_ERROR_FAILED;
 
   // When it is done, we'll get called back on StreamCreated() or
   // StreamCreationFailed().
   RenderViewImpl* render_view = static_cast<RenderViewImpl*>(
       renderer_ppapi_host_->GetRenderViewForInstance(pp_instance()));
 
   audio_input_ = PepperPlatformAudioInput::Create(
       render_view->AsWeakPtr(), device_id,
       document_url,
       static_cast<int>(sample_rate),
       static_cast<int>(sample_frame_count), this);
   if (audio_input_) {
-    open_context_.reset(new ppapi::host::ReplyMessageContext(
-        context->MakeReplyMessageContext()));
+    open_context_ = context->MakeReplyMessageContext();
+    open_pending_ = true;
     return PP_OK_COMPLETIONPENDING;
   } else {
     return PP_ERROR_FAILED;
   }
 }
 
 int32_t PepperAudioInputHost::OnStartOrStop(
     ppapi::host::HostMessageContext* /* context */,
     bool capture) {
   if (!audio_input_)
@@ skipping 13 matching lines @@
 
 void PepperAudioInputHost::OnOpenComplete(
     int32_t result,
     base::SharedMemoryHandle shared_memory_handle,
     size_t shared_memory_size,
     base::SyncSocket::Handle socket_handle) {
   // Make sure the handles are cleaned up.
   base::SyncSocket scoped_socket(socket_handle);
   base::SharedMemory scoped_shared_memory(shared_memory_handle, false);
 
-  if (!open_context_) {
+  if (!open_pending_) {
     NOTREACHED();
     return;
   }
 
   ppapi::proxy::SerializedHandle serialized_socket_handle(
       ppapi::proxy::SerializedHandle::SOCKET);
   ppapi::proxy::SerializedHandle serialized_shared_memory_handle(
       ppapi::proxy::SerializedHandle::SHARED_MEMORY);
 
   if (result == PP_OK) {
     IPC::PlatformFileForTransit temp_socket =
         IPC::InvalidPlatformFileForTransit();
     base::SharedMemoryHandle temp_shmem = base::SharedMemory::NULLHandle();
     result = GetRemoteHandles(
         scoped_socket, scoped_shared_memory, &temp_socket, &temp_shmem);
 
     serialized_socket_handle.set_socket(temp_socket);
     serialized_shared_memory_handle.set_shmem(temp_shmem, shared_memory_size);
   }
 
   // Send all the values, even on error. This simplifies some of our cleanup
   // code since the handles will be in the other process and could be
   // inconvenient to clean up. Our IPC code will automatically handle this for
   // us, as long as the remote side always closes the handles it receives, even
   // in the failure case.
-  open_context_->params.set_result(result);
-  open_context_->params.AppendHandle(serialized_socket_handle);
-  open_context_->params.AppendHandle(serialized_shared_memory_handle);
-
-  host()->SendReply(*open_context_, PpapiPluginMsg_AudioInput_OpenReply());
-  open_context_.reset();
+  open_context_.params.AppendHandle(serialized_socket_handle);
+  open_context_.params.AppendHandle(serialized_shared_memory_handle);

[dmichael (off chromium), 2014/04/11 18:11:23]

What about adding an is_valid to the ReplyMessageContext? I notice that the
constructor doesn't initialize anything. If it did, a simple little is_valid()
or is_initialized() function could check the params to see if they have the
default values.

As is, it seems like using a scoped_ptr is actually simpler in this particular
Host.

[bbudge, 2014/04/11 20:41:19]

I thought about this. I think it's a great idea so I created another CL for it.

+  SendOpenReply(result);
 }
 
 int32_t PepperAudioInputHost::GetRemoteHandles(
     const base::SyncSocket& socket,
     const base::SharedMemory& shared_memory,
     IPC::PlatformFileForTransit* remote_socket_handle,
     base::SharedMemoryHandle* remote_shared_memory_handle) {
   *remote_socket_handle = renderer_ppapi_host_->ShareHandleWithRemote(
       ConvertSyncSocketHandle(socket), false);
   if (*remote_socket_handle == IPC::InvalidPlatformFileForTransit())
     return PP_ERROR_FAILED;
 
   *remote_shared_memory_handle = renderer_ppapi_host_->ShareHandleWithRemote(
       ConvertSharedMemoryHandle(shared_memory), false);
   if (*remote_shared_memory_handle == IPC::InvalidPlatformFileForTransit())
     return PP_ERROR_FAILED;
 
   return PP_OK;
 }
 
 void PepperAudioInputHost::Close() {
   if (!audio_input_)
     return;
 
   audio_input_->ShutDown();
   audio_input_ = NULL;
 
-  if (open_context_) {
-    open_context_->params.set_result(PP_ERROR_ABORTED);
-    host()->SendReply(*open_context_, PpapiPluginMsg_AudioInput_OpenReply());
-    open_context_.reset();
-  }
+  if (open_pending_)
+    SendOpenReply(PP_ERROR_ABORTED);
+}
+
+void PepperAudioInputHost::SendOpenReply(int32_t result) {
+  open_context_.params.set_result(result);
+  host()->SendReply(open_context_, PpapiPluginMsg_AudioInput_OpenReply());
+  open_context_ = ppapi::host::ReplyMessageContext();
+  open_pending_ = false;
 }
 
 }  // namespace content