Refactoring of new IPC-only pepper implementation

ppapi/proxy/file_chooser_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/file_chooser_resource.h"
 
 #include "base/string_split.h"
 #include "ipc/ipc_message.h"
 #include "ppapi/c/pp_errors.h"
+#include "ppapi/proxy/dispatch_reply_message.h"
 #include "ppapi/proxy/ppapi_messages.h"
 #include "ppapi/proxy/ppb_file_ref_proxy.h"
 #include "ppapi/shared_impl/var.h"
 
 namespace ppapi {
 namespace proxy {
 
-FileChooserResource::FileChooserResource(IPC::Sender* sender,
+FileChooserResource::FileChooserResource(Connection connection,
                                          PP_Instance instance,
                                          PP_FileChooserMode_Dev mode,
                                          const std::string& accept_types)
-    : PluginResource(sender, instance),
+    : PluginResource(connection, instance),
       mode_(mode) {
   PopulateAcceptTypes(accept_types, &accept_types_);
 }
 
 FileChooserResource::~FileChooserResource() {
 }
 
 thunk::PPB_FileChooser_API* FileChooserResource::AsPPB_FileChooser_API() {
   return this;
 }
@@ skipping 57 matching lines @@
     // type it would just be a "/".
     if (type.length() < 2)
       continue;
     if (type.find_first_of('/') == std::string::npos && type[0] != '.')
       continue;
     StringToLowerASCII(&type);
     output->push_back(type);
   }
 }
 
-void FileChooserResource::OnReplyReceived(int /* sequence */,
-                                          int32_t result,
-                                          const IPC::Message& msg) {
-  PpapiPluginMsg_FileChooser_ShowReply::Schema::Param param;
-  PpapiPluginMsg_FileChooser_ShowReply::Read(&msg, &param);
-  const std::vector<ppapi::PPB_FileRef_CreateInfo>& chosen_files = param.a;
+void FileChooserResource::OnReplyReceived(
+    const ResourceMessageReplyParams& params,
+    const IPC::Message& msg) {
+  IPC_BEGIN_MESSAGE_MAP(FileChooserResource, msg)
+    PPAPI_DISPATCH_RESOURCE_REPLY(PpapiPluginMsg_FileChooser_ShowReply,
+                                  OnPluginMsgShowReply)
+  IPC_END_MESSAGE_MAP()
+}
 
+void FileChooserResource::OnPluginMsgShowReply(
+    const ResourceMessageReplyParams& params,
+    const std::vector<PPB_FileRef_CreateInfo>& chosen_files) {
   if (output_.is_valid()) {
     // Using v0.6 of the API with the output array.
     std::vector<PP_Resource> files;
     for (size_t i = 0; i < chosen_files.size(); i++)
       files.push_back(PPB_FileRef_Proxy::DeserializeFileRef(chosen_files[i]));
     output_.StoreResourceVector(files);
   } else {
     // Convert each of the passed in file infos to resources. These will be
     // owned by the FileChooser object until they're passed to the plugin.
     DCHECK(file_queue_.empty());
     for (size_t i = 0; i < chosen_files.size(); i++) {
       file_queue_.push(PPB_FileRef_Proxy::DeserializeFileRef(
           chosen_files[i]));
     }
   }
 
   // Notify the plugin of the new data.
-  TrackedCallback::ClearAndRun(&callback_, result);
+  TrackedCallback::ClearAndRun(&callback_, params.result());
   // DANGER: May delete |this|!
 }
 
 int32_t FileChooserResource::ShowInternal(
     PP_Bool save_as,
     const PP_Var& suggested_file_name,
     scoped_refptr<TrackedCallback> callback) {
   if (TrackedCallback::IsPending(callback_))
     return PP_ERROR_INPROGRESS;
 
   if (!sent_create_to_renderer())
     SendCreateToRenderer(PpapiHostMsg_FileChooser_Create());
 
   callback_ = callback;
   StringVar* sugg_str = StringVar::FromPPVar(suggested_file_name);
 
   CallRenderer(PpapiHostMsg_FileChooser_Show(
       PP_ToBool(save_as),
       mode_ == PP_FILECHOOSERMODE_OPENMULTIPLE,
       sugg_str ? sugg_str->value() : std::string(),
       accept_types_));
   return PP_OK_COMPLETIONPENDING;
 }
 
 }  // namespace proxy
 }  // namespace ppapi