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

tests/photo/photo.cc

 /*
  * Copyright (c) 2008 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that be
  * found in the LICENSE file.
  */
 
 // Native Client Photo Darkroom demo
 //   Uses SRPC (Simple Remote Procedure Call)
 //   Uses low level NaCl multimedia system.
 //   Runs in the browser.
@@ skipping 532 matching lines @@
   pthread_mutex_destroy(&mutex_);
 }
 
 
 // SRPC function OpenPhoto
 // invoked via Javascript, called from SRPC service thread.
 void OpenPhoto(NaClSrpcRpc* rpc,
                NaClSrpcArg** in_args,
                NaClSrpcArg** out_args,
                NaClSrpcClosure* done) {
-  char* filename = in_args[0]->u.sval;
+  char* filename = in_args[0]->arrays.str;
   g_darkroom.SetLoadFilename(filename);
   rpc->result = NACL_SRPC_RESULT_OK;
   done->Run(done);
 }
 
 
 // SRPC function UpdateSaturation
 // invoked via Javascript, called from SRPC service thread.
 void UpdateSaturation(NaClSrpcRpc* rpc,
                       NaClSrpcArg** in_args,
@@ skipping 302 matching lines @@
   }
   // initialize nacl video
   Initialize();
   // run the photo demo loop
   RunDemo();
   // shutdown nacl video
   Shutdown();
   NaClSrpcModuleFini();
   return 0;
 }