Pass the nacl start parameters as a struct.

chrome/nacl/nacl_listener.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 "chrome/nacl/nacl_listener.h"
 
 #include <errno.h>
 #include <stdlib.h>
 
 #include "base/command_line.h"
@@ skipping 134 matching lines @@
   filter_.reset(new IPC::SyncMessageFilter(&shutdown_event_));
   channel_->AddFilter(filter_.get());
   channel_->Init(channel_name, IPC::Channel::MODE_CLIENT, true);
   main_loop_ = MessageLoop::current();
   main_loop_->Run();
 }
 
 bool NaClListener::OnMessageReceived(const IPC::Message& msg) {
   bool handled = true;
   IPC_BEGIN_MESSAGE_MAP(NaClListener, msg)
-      IPC_MESSAGE_HANDLER(NaClProcessMsg_Start, OnStartSelLdr)
+      IPC_MESSAGE_HANDLER(NaClProcessMsg_Start, OnMsgStart)
       IPC_MESSAGE_UNHANDLED(handled = false)
   IPC_END_MESSAGE_MAP()
   return handled;
 }
 
-void NaClListener::OnStartSelLdr(std::vector<nacl::FileDescriptor> handles,
-                                 const std::string& validation_cache_key,
-                                 const std::string& version,
-                                 bool enable_exception_handling) {
+void NaClListener::OnMsgStart(const nacl::NaClStartParams& params) {
   struct NaClChromeMainArgs *args = NaClChromeMainArgsCreate();
   if (args == NULL) {
     LOG(ERROR) << "NaClChromeMainArgsCreate() failed";
     return;
   }
 
+  std::vector<nacl::FileDescriptor> handles = params.handles;
+
 #if defined(OS_LINUX) || defined(OS_MACOSX)
   args->create_memory_object_func = CreateMemoryObject;
 # if defined(OS_MACOSX)
   CHECK(handles.size() >= 1);
   g_shm_fd = nacl::ToNativeHandle(handles[handles.size() - 1]);
   handles.pop_back();
 # endif
 #endif
 
   CHECK(handles.size() >= 1);
   NaClHandle irt_handle = nacl::ToNativeHandle(handles[handles.size() - 1]);
   handles.pop_back();
 
 #if defined(OS_WIN)
   args->irt_fd = _open_osfhandle(reinterpret_cast<intptr_t>(irt_handle),
                                  _O_RDONLY | _O_BINARY);
   if (args->irt_fd < 0) {
     LOG(ERROR) << "_open_osfhandle() failed";
     return;
   }
 #else
   args->irt_fd = irt_handle;
 #endif
 
   if (CheckEnvVar("NACL_VALIDATION_CACHE", false)) {
     LOG(INFO) << "NaCl validation cache enabled.";
     // The cache structure is not freed and exists until the NaCl process exits.
     args->validation_cache = CreateValidationCache(
-        new BrowserValidationDBProxy(this), validation_cache_key, version);
+        new BrowserValidationDBProxy(this), params.validation_cache_key,
+        params.version);
   }
 
   CHECK(handles.size() == 1);
   args->imc_bootstrap_handle = nacl::ToNativeHandle(handles[0]);
-  args->enable_exception_handling = enable_exception_handling;
+  args->enable_exception_handling = params.enable_exception_handling;
   args->enable_debug_stub = debug_enabled_;
   NaClChromeMainStart(args);
   NOTREACHED();
 }