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

src/trusted/plugin/desc_based_handle.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 <setjmp.h>
 #include <stdio.h>
 #include <string.h>
@@ skipping 22 matching lines @@
   plugin::SharedMemory* portable_shared_memory =
       plugin::SharedMemory::New(ptr->plugin(), shm_wrapper);
   plugin::ScriptableHandle* shared_memory =
     ptr->browser_interface()->NewScriptableHandle(portable_shared_memory);
   if (NULL == shared_memory) {
     return false;
   }
   PLUGIN_PRINTF(("Map (shared_memory=%p)\n",
                  static_cast<void*>(shared_memory)));
   params->outs()[0]->tag = NACL_SRPC_ARG_TYPE_OBJECT;
-  params->outs()[0]->u.oval = shared_memory;
+  params->outs()[0]->arrays.oval = shared_memory;
   return true;
 }
 
 }  // namespace
 
 namespace plugin {
 
 DescBasedHandle::DescBasedHandle()
     : plugin_(NULL), wrapper_(NULL) {
   PLUGIN_PRINTF(("DescBasedHandle::DescBasedHandle (this=%p)\n",
@@ skipping 33 matching lines @@
 BrowserInterface* DescBasedHandle::browser_interface() const {
   return plugin_->browser_interface();
 }
 
 void DescBasedHandle::LoadMethods() {
   // Methods supported by DescBasedHandle.
   AddMethodCall(Map, "map", "", "h");
 }
 
 }  // namespace plugin