Non-SFI NaCl: Batch-open resource files

components/nacl/common/nacl_types.cc

Index: components/nacl/common/nacl_types.cc
diff --git a/components/nacl/common/nacl_types.cc b/components/nacl/common/nacl_types.cc
index 572b72c44cda14d3f7e6ca0a3cd4d668ffa29762..9a768894854181b87fdb3eb13322aeb77ab0f1f9 100644
--- a/components/nacl/common/nacl_types.cc
+++ b/components/nacl/common/nacl_types.cc
@@ -33,6 +33,9 @@ NaClLaunchParams::NaClLaunchParams(
     const IPC::PlatformFileForTransit& nexe_file,
     uint64_t nexe_token_lo,
     uint64_t nexe_token_hi,
+    const std::vector<IPC::PlatformFileForTransit>& resource_files,
+    const std::vector<std::pair<uint64_t, uint64_t> >& resource_file_tokens,
+    const std::vector<std::string>& resource_keys,
     int render_view_id,
     uint32 permission_bits,
     bool uses_nonsfi_mode,
@@ -41,6 +44,9 @@ NaClLaunchParams::NaClLaunchParams(
       nexe_file(nexe_file),
       nexe_token_lo(nexe_token_lo),
       nexe_token_hi(nexe_token_hi),
+      resource_files(resource_files),
+      resource_file_tokens(resource_file_tokens),
+      resource_keys(resource_keys),
       render_view_id(render_view_id),
       permission_bits(permission_bits),
       uses_nonsfi_mode(uses_nonsfi_mode),
@@ -79,4 +85,26 @@ NaClLaunchResult::NaClLaunchResult(
 NaClLaunchResult::~NaClLaunchResult() {
 }
 
+NaClOpenExecutableResult::NaClOpenExecutableResult()
+    : file(IPC::InvalidPlatformFileForTransit()),
+      file_token_lo(0),
+      file_token_hi(0) {
+}
+
+NaClOpenExecutableResult::NaClOpenExecutableResult(
+      IPC::PlatformFileForTransit file,
+      uint64_t file_token_lo,
+      uint64_t file_token_hi,
+      const std::vector<IPC::PlatformFileForTransit>& resource_files,
+      const std::vector<std::pair<uint64_t, uint64_t> >& resource_file_tokens)
+    : file(file),
+      file_token_lo(file_token_lo),
+      file_token_hi(file_token_hi),
+      resource_files(resource_files),
+      resource_file_tokens(resource_file_tokens) {
+}
+
+NaClOpenExecutableResult::~NaClOpenExecutableResult() {
+}
+
 }  // namespace nacl