Converted PluginResource reply message handling to use base::Callback

ppapi/proxy/gamepad_resource.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 "ppapi/proxy/gamepad_resource.h"
 
 #include <string.h>
 
+#include "base/bind.h"
 #include "base/threading/platform_thread.h"
 #include "ppapi/proxy/dispatch_reply_message.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/shared_impl/ppb_gamepad_shared.h"
 
 namespace ppapi {
 namespace proxy {
 
 namespace {
 
@@ skipping 22 matching lines @@
 }
 
 }  // namespace
 
 GamepadResource::GamepadResource(Connection connection, PP_Instance instance)
     : PluginResource(connection, instance),
       buffer_(NULL) {
   memset(&last_read_, 0, sizeof(last_read_));
 
   SendCreateToBrowser(PpapiHostMsg_Gamepad_Create());
-  CallBrowser(PpapiHostMsg_Gamepad_RequestMemory());
+  CallBrowser<PpapiPluginMsg_Gamepad_SendMemory>(
+      PpapiHostMsg_Gamepad_RequestMemory(),
+      base::Bind(&GamepadResource::OnPluginMsgSendMemory, this));
 }
 
 GamepadResource::~GamepadResource() {
 }
 
 void GamepadResource::Sample(PP_GamepadsSampleData* data) {
   if (!buffer_) {
     // Browser hasn't sent back our shared memory, give the plugin gamepad
     // data corresponding to "not connected".
     memset(data, 0, sizeof(PP_GamepadsSampleData));
@@ skipping 22 matching lines @@
   } while (ReadRetry(&buffer_->sequence, version));
 
   // In the event of a read failure, just leave the last read data as-is (the
   // hardware thread is taking unusally long).
   if (contention_count < kMaximumContentionCount)
     ConvertWebKitGamepadData(read_into, &last_read_);
 
   memcpy(data, &last_read_, sizeof(PP_GamepadsSampleData));
 }
 
-void GamepadResource::OnReplyReceived(const ResourceMessageReplyParams& params,
-                                      const IPC::Message& msg) {
-  IPC_BEGIN_MESSAGE_MAP(GamepadResource, msg)
-    PPAPI_DISPATCH_RESOURCE_REPLY_0(PpapiPluginMsg_Gamepad_SendMemory,
-                                    OnPluginMsgSendMemory)
-  IPC_END_MESSAGE_MAP()
-}
-
 void GamepadResource::OnPluginMsgSendMemory(
     const ResourceMessageReplyParams& params) {
   // On failure, the handle will be null and the CHECK below will be tripped.
   base::SharedMemoryHandle handle;
   params.GetSharedMemoryHandleAtIndex(0, &handle);
 
   shared_memory_.reset(new base::SharedMemory(handle, true));
   CHECK(shared_memory_->Map(sizeof(ContentGamepadHardwareBuffer)));
   buffer_ = static_cast<const ContentGamepadHardwareBuffer*>(
       shared_memory_->memory());
 }
 
 }  // namespace proxy
 }  // namespace ppapi