Revert 171389

ppapi/proxy/plugin_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/plugin_resource.h"
 
 #include <limits>
 
 #include "ppapi/proxy/ppapi_messages.h"
 
@@ skipping 90 matching lines @@
 }
 
 bool PluginResource::SendResourceCall(
     Destination dest,
     const ResourceMessageCallParams& call_params,
     const IPC::Message& nested_msg) {
   return GetSender(dest)->Send(
       new PpapiHostMsg_ResourceCall(call_params, nested_msg));
 }
 
-int32_t PluginResource::GenericSyncCall(Destination dest,
-                                        const IPC::Message& msg,
-                                        IPC::Message* reply) {
+int32_t PluginResource::GenericSyncCall(
+    Destination dest,
+    const IPC::Message& msg,
+    IPC::Message* reply,
+    ResourceMessageReplyParams* reply_params) {
   ResourceMessageCallParams params(pp_resource(), GetNextSequence());
   params.set_has_callback();
-  ResourceMessageReplyParams reply_params;
   bool success = GetSender(dest)->Send(new PpapiHostMsg_ResourceSyncCall(
-      params, msg, &reply_params, reply));
+      params, msg, reply_params, reply));
   if (success)
-    return reply_params.result();
+    return reply_params->result();
   return PP_ERROR_FAILED;
 }
 
 int32_t PluginResource::GetNextSequence() {
   // Return the value with wraparound, making sure we don't make a sequence
   // number with a 0 ID. Note that signed wraparound is undefined in C++ so we
   // manually check.
   int32_t ret = next_sequence_number_;
   if (next_sequence_number_ == std::numeric_limits<int32_t>::max())
     next_sequence_number_ = 1;  // Skip 0 which is invalid.
   else
     next_sequence_number_++;
   return ret;
 }
 
 }  // namespace proxy
 }  // namespace ppapi