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

tests/fake_browser/deferred_srpc_init.c

 /*
  * Copyright 2010 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 <assert.h>
 #include <stdio.h>
 #include <string.h>
 #include <unistd.h>
 
 #include <nacl/nacl_srpc.h>
 #include <sys/nacl_syscalls.h>
 
 
 void TestMethod(NaClSrpcRpc *rpc,
                 NaClSrpcArg **in_args,
                 NaClSrpcArg **out_args,
                 NaClSrpcClosure *done) {
-  out_args[0]->u.sval.str = strdup("Deferred SRPC connection worked.");
+  out_args[0]->arrays.str = strdup("Deferred SRPC connection worked.");
   rpc->result = NACL_SRPC_RESULT_OK;
   done->Run(done);
 }
 
 const struct NaClSrpcHandlerDesc srpc_methods[] = {
   { "test_method::s", TestMethod },
   { NULL, NULL },
 };
 
 int main() {
@@ skipping 15 matching lines @@
   rc = close(fd);
   assert(rc == 0);
 
   /* But the third connection was just right!  We accept it. */
   fd = imc_accept(3);
   assert(fd >= 0);
   NaClSrpcServerLoop(fd, srpc_methods, NULL);
 
   return 0;
 }