Restructure the structs/unions involved in SRPC argument passing. This will...

src/trusted/plugin/npapi/plugin_npapi.cc

 /*
  * Copyright 2008 The Native Client 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 "native_client/src/trusted/plugin/npapi/plugin_npapi.h"
 
 #include <stdio.h>
@@ skipping 36 matching lines @@
   plugin::PluginNpapi::kHrefIdent = NPN_GetStringIdentifier("href");
   plugin::PluginNpapi::kLengthIdent = NPN_GetStringIdentifier("length");
   plugin::PluginNpapi::kLocationIdent = NPN_GetStringIdentifier("location");
   identifiers_initialized = true;
 }
 
 // TODO(polina): is there a way to share this with PluginPPAPI?
 bool UrlAsNaClDesc(void* obj, plugin::SrpcParams* params) {
   NaClSrpcArg** ins = params->ins();
   PLUGIN_PRINTF(("UrlAsNaClDesc (obj=%p, url=%s, callback=%p)\n",
-                 obj, ins[0]->u.sval.str, ins[1]->u.oval));
+                 obj, ins[0]->arrays.str, ins[1]->arrays.oval));
 
   plugin::Plugin* plugin = reinterpret_cast<plugin::Plugin*>(obj);
-  const char* url = ins[0]->u.sval.str;
-  NPObject* callback_obj = reinterpret_cast<NPObject*>(ins[1]->u.oval);
+  const char* url = ins[0]->arrays.str;
+  NPObject* callback_obj = reinterpret_cast<NPObject*>(ins[1]->arrays.oval);
 
   plugin::UrlAsNaClDescNotify* callback =
       new(std::nothrow) plugin::UrlAsNaClDescNotify(plugin, url, callback_obj);
   if (NULL == callback) {
     params->set_exception_string("out of memory in __urlAsNaClDesc");
     return false;
   }
   if (!callback->StartDownload()) {
     PLUGIN_PRINTF(("UrlAsNaClDesc (failed to load url to local file)\n"));
     params->set_exception_string("specified url could not be loaded");
@@ skipping 480 matching lines @@
   if (plugin->receive_thread_running_) {
     params->set_exception_string("A callback has already been registered");
     return false;
   }
   ReceiveThreadArgs* args = new(std::nothrow) ReceiveThreadArgs;
   if (args == NULL) {
     params->set_exception_string("Memory allocation failed");
     return false;
   }
   args->plugin = InstanceIdentifierToNPP(plugin->instance_id());
-  args->callback = reinterpret_cast<NPObject*>(params->ins()[0]->u.oval);
+  args->callback = reinterpret_cast<NPObject*>(params->ins()[0]->arrays.oval);
   NPN_RetainObject(args->callback);
   nacl::DescWrapper* socket = plugin->service_runtime_->async_receive_desc();
   NaClDescRef(socket->desc());
   args->socket = plugin->wrapper_factory()->MakeGeneric(socket->desc());
 
   // It would be nice if the thread interface did not require us to
   // specify a stack size.  This is fairly arbitrary.
   size_t stack_size = 128 << 10;
   NaClThreadCreateJoinable(&plugin->receive_thread_, AsyncReceiveThread, args,
                            stack_size);
   plugin->receive_thread_running_ = true;
   return true;
 }
 
 }  // namespace plugin