Pepper: Remove LOAD_MODULE SRPC call in SFI mode.

components/nacl/common/nacl_types.h

 // Copyright 2013 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.
 
 #ifndef COMPONENTS_NACL_COMMON_NACL_TYPES_H_
 #define COMPONENTS_NACL_COMMON_NACL_TYPES_H_
 
 #include <string>
 #include <vector>
 
@@ skipping 26 matching lines @@
 }
 #endif
 
 
 // Parameters sent to the NaCl process when we start it.
 struct NaClStartParams {
   NaClStartParams();
   ~NaClStartParams();
 
   IPC::PlatformFileForTransit nexe_file;
+  uint64_t nexe_token_lo;
+  uint64_t nexe_token_hi;
 
   std::vector<FileDescriptor> handles;
   FileDescriptor debug_stub_server_bound_socket;
 
   bool validation_cache_enabled;
   std::string validation_cache_key;
   // Chrome version string. Sending the version string over IPC avoids linkage
   // issues in cases where NaCl is not compiled into the main Chromium
   // executable or DLL.
   std::string version;
 
   bool enable_exception_handling;
   bool enable_debug_stub;
   bool enable_ipc_proxy;
   bool uses_irt;
   bool enable_dyncode_syscalls;
+
   // NOTE: Any new fields added here must also be added to the IPC
   // serialization in nacl_messages.h and (for POD fields) the constructor
   // in nacl_types.cc.
 };
 
 // Parameters sent to the browser process to have it launch a NaCl process.
 //
 // If you change this, you will also need to update the IPC serialization in
 // nacl_host_messages.h.
 struct NaClLaunchParams {
   NaClLaunchParams();
   NaClLaunchParams(const std::string& manifest_url,
                    const IPC::PlatformFileForTransit& nexe_file,
+                   uint64_t nexe_token_lo,
+                   uint64_t nexe_token_hi,
                    int render_view_id,
                    uint32 permission_bits,
                    bool uses_irt,
                    bool uses_nonsfi_mode,
                    bool enable_dyncode_syscalls,
                    bool enable_exception_handling,
                    bool enable_crash_throttling);
-  NaClLaunchParams(const NaClLaunchParams& l);
   ~NaClLaunchParams();
 
   std::string manifest_url;
   IPC::PlatformFileForTransit nexe_file;

[hidehiko, 2014/07/01 05:39:01]

Probably, it would be better to note that, on Windows, this HANDLE is valid in
the renderer's context, (because it seems not a common manner in Chrome?)

Or, IMHO, it may be ok to expose the BrokerGetFileHandleForProcess(), because
its underlying API BrokerDuplicateHandle is already in the public and
BrokerGetFileHandleForProcess looks its simpler wrapper. WDYT?

[teravest, 2014/07/01 17:48:34]

I've added a comment here as you suggested. I thought about trying to use
BrokerGetFileHandleForProcess to duplicate the handle in the renderer, but I
think it's simpler to only duplicate the handle once, and not bother involving
the broker.

+  uint64_t nexe_token_lo;
+  uint64_t nexe_token_hi;
+
   int render_view_id;
   uint32 permission_bits;
   bool uses_irt;
   bool uses_nonsfi_mode;
   bool enable_dyncode_syscalls;
   bool enable_exception_handling;
   bool enable_crash_throttling;
 };
 
 struct NaClLaunchResult {
@@ skipping 20 matching lines @@
   // For plugin <-> renderer ManifestService communication.
   IPC::ChannelHandle manifest_service_ipc_channel_handle;
 
   base::ProcessId plugin_pid;
   int plugin_child_id;
 };
 
 }  // namespace nacl
 
 #endif  // COMPONENTS_NACL_COMMON_NACL_TYPES_H_