Pass the nacl start parameters as a struct.

chrome/browser/nacl_host/nacl_process_host.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/browser/nacl_host/nacl_process_host.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 862 matching lines @@
 
 // The asynchronous attempt to get the IRT file open has completed.
 void NaClProcessHost::IrtReady() {
   NaClBrowser* nacl_browser = NaClBrowser::GetInstance();
   if (!nacl_browser->IrtAvailable() || !SendStart()) {
     DLOG(ERROR) << "Cannot launch NaCl process";
     delete this;
   }
 }
 
-bool NaClProcessHost::SendStart() {
+bool NaClProcessHost::MakeStartParams(nacl::NaClStartParams* params) {
   NaClBrowser* nacl_browser = NaClBrowser::GetInstance();
+
+  params->validation_cache_key = nacl_browser->GetValidatorCacheKey();
+  params->version = chrome::VersionInfo().CreateVersionString();
+  params->enable_exception_handling = enable_exception_handling_;
+
   base::PlatformFile irt_file = nacl_browser->IrtFile();
   CHECK_NE(irt_file, base::kInvalidPlatformFileValue);
 
   std::vector<nacl::FileDescriptor> handles_for_renderer;
   base::ProcessHandle nacl_process_handle;
 
   for (size_t i = 0; i < internal_->sockets_for_renderer.size(); i++) {
 #if defined(OS_WIN)
     // Copy the handle into the renderer process.
     HANDLE handle_in_renderer;
@@ skipping 41 matching lines @@
   // Get the pid of the NaCl process
   base::ProcessId nacl_process_id = base::GetProcId(data.handle);
 
   ChromeViewHostMsg_LaunchNaCl::WriteReplyParams(
       reply_msg_, handles_for_renderer, nacl_process_handle, nacl_process_id);
   chrome_render_message_filter_->Send(reply_msg_);
   chrome_render_message_filter_ = NULL;
   reply_msg_ = NULL;
   internal_->sockets_for_renderer.clear();
 
-  std::vector<nacl::FileDescriptor> handles_for_sel_ldr;
   for (size_t i = 0; i < internal_->sockets_for_sel_ldr.size(); i++) {
     if (!SendHandleToSelLdr(data.handle,
                             internal_->sockets_for_sel_ldr[i], true,
-                            &handles_for_sel_ldr)) {
+                            &params->sockets)) {
       return false;
     }
   }
 
   // Send over the IRT file handle.  We don't close our own copy!
-  if (!SendHandleToSelLdr(data.handle, irt_file, false, &handles_for_sel_ldr))
+  if (!SendHandleToSelLdr(data.handle, irt_file, false, &params->sockets))
     return false;
 
 #if defined(OS_MACOSX)
   // For dynamic loading support, NaCl requires a file descriptor that
   // was created in /tmp, since those created with shm_open() are not
   // mappable with PROT_EXEC.  Rather than requiring an extra IPC
   // round trip out of the sandbox, we create an FD here.
   base::SharedMemory memory_buffer;
   base::SharedMemoryCreateOptions options;
   options.size = 1;
   options.executable = true;
   if (!memory_buffer.Create(options)) {
     DLOG(ERROR) << "Failed to allocate memory buffer";
     return false;
   }
   nacl::FileDescriptor memory_fd;
   memory_fd.fd = dup(memory_buffer.handle().fd);
   if (memory_fd.fd < 0) {
     DLOG(ERROR) << "Failed to dup() a file descriptor";
     return false;
   }
   memory_fd.auto_close = true;
-  handles_for_sel_ldr.push_back(memory_fd);
+  params->sockets.push_back(memory_fd);

[Mark Seaborn, 2012/04/06 23:13:50]

The name "sockets" isn't accurate because this array also contains the IRT FD (a
file) and memory_fd.  Can you keep it named as "handles"?

 #endif
 
-  // Sending the version string over IPC avoids linkage issues in cases where

[Mark Seaborn, 2012/04/06 23:13:50]

Can you keep this comment and move it to the point where we fill out 'version'?

-  // NaCl is not compiled into the main Chromium executable or DLL.
-  chrome::VersionInfo version_info;
-  IPC::Message* start_message =
-      new NaClProcessMsg_Start(handles_for_sel_ldr,
-                               nacl_browser->GetValidatorCacheKey(),
-                               version_info.CreateVersionString(),
-                               enable_exception_handling_);
+  return true;
+}
+
+bool NaClProcessHost::SendStart() {
+  nacl::NaClStartParams params;
+  if (!MakeStartParams(&params))
+    return false;
+
+  IPC::Message* start_message = new NaClProcessMsg_Start(params);
 #if defined(OS_WIN)
   if (debug_context_ != NULL) {
     debug_context_->SetStartMessage(start_message);
     debug_context_->SendStartMessage();
   } else {
     process_->Send(start_message);
   }
 #else
   process_->Send(start_message);
 #endif
@@ skipping 25 matching lines @@
 }
 
 void NaClProcessHost::OnQueryKnownToValidate(const std::string& signature,
                                              bool* result) {
   *result = NaClBrowser::GetInstance()->QueryKnownToValidate(signature);
 }
 
 void NaClProcessHost::OnSetKnownToValidate(const std::string& signature) {
   NaClBrowser::GetInstance()->SetKnownToValidate(signature);
 }