Refactor some ResourceMessageReply usages.

content/renderer/pepper/pepper_device_enumeration_host_helper.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_device_enumeration_host_helper.h"
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 80 matching lines @@
 };
 
 PepperDeviceEnumerationHostHelper::PepperDeviceEnumerationHostHelper(
     ppapi::host::ResourceHost* resource_host,
     Delegate* delegate,
     PP_DeviceType_Dev device_type,
     const GURL& document_url)
     : resource_host_(resource_host),
       delegate_(delegate),
       device_type_(device_type),
-      document_url_(document_url) {
+      document_url_(document_url),
+      enumerate_devices_pending_(false) {
 }
 
 PepperDeviceEnumerationHostHelper::~PepperDeviceEnumerationHostHelper() {
 }
 
 bool PepperDeviceEnumerationHostHelper::HandleResourceMessage(
     const IPC::Message& msg,
     HostMessageContext* context,
     int32_t* result) {
   bool return_value = false;
@@ skipping 16 matching lines @@
         PpapiHostMsg_DeviceEnumeration_StopMonitoringDeviceChange,
         OnStopMonitoringDeviceChange)
   IPC_END_MESSAGE_MAP()
 
   *handled = false;
   return PP_ERROR_FAILED;
 }
 
 int32_t PepperDeviceEnumerationHostHelper::OnEnumerateDevices(
     HostMessageContext* context) {
-  if (enumerate_devices_context_)
+  if (enumerate_devices_pending_)
     return PP_ERROR_INPROGRESS;
 
   enumerate_.reset(new ScopedRequest(
       this,
       base::Bind(&PepperDeviceEnumerationHostHelper::OnEnumerateDevicesComplete,
                  base::Unretained(this))));
   if (!enumerate_->requested())
     return PP_ERROR_FAILED;
 
-  enumerate_devices_context_.reset(
-      new ppapi::host::ReplyMessageContext(context->MakeReplyMessageContext()));
+  enumerate_devices_pending_ = true;
+  enumerate_devices_context_ = context->MakeReplyMessageContext();
   return PP_OK_COMPLETIONPENDING;
 }
 
 int32_t PepperDeviceEnumerationHostHelper::OnMonitorDeviceChange(
     HostMessageContext* /* context */,
     uint32_t callback_id) {
   monitor_.reset(new ScopedRequest(
       this,
       base::Bind(&PepperDeviceEnumerationHostHelper::OnNotifyDeviceChange,
                  base::Unretained(this), callback_id)));
 
   return monitor_->requested() ? PP_OK : PP_ERROR_FAILED;
 }
 
 int32_t PepperDeviceEnumerationHostHelper::OnStopMonitoringDeviceChange(
     HostMessageContext* /* context */) {
   monitor_.reset(NULL);
   return PP_OK;
 }
 
 void PepperDeviceEnumerationHostHelper::OnEnumerateDevicesComplete(
     int /* request_id */,
     const std::vector<ppapi::DeviceRefData>& devices) {
-  DCHECK(enumerate_devices_context_.get());
+  DCHECK(enumerate_devices_pending_);
 
   enumerate_.reset(NULL);
 
-  enumerate_devices_context_->params.set_result(PP_OK);
+  enumerate_devices_context_.params.set_result(PP_OK);
   resource_host_->host()->SendReply(
-      *enumerate_devices_context_,
+      enumerate_devices_context_,
       PpapiPluginMsg_DeviceEnumeration_EnumerateDevicesReply(devices));
-  enumerate_devices_context_.reset();
+  enumerate_devices_context_ = ppapi::host::ReplyMessageContext();
+  enumerate_devices_pending_ = false;
 }
 
 void PepperDeviceEnumerationHostHelper::OnNotifyDeviceChange(
     uint32_t callback_id,
     int /* request_id */,
     const std::vector<ppapi::DeviceRefData>& devices) {
   resource_host_->host()->SendUnsolicitedReply(
       resource_host_->pp_resource(),
       PpapiPluginMsg_DeviceEnumeration_NotifyDeviceChange(
           callback_id,
           devices));
 }
 
 }  // namespace content