Remove LoadModule SRPC for non-SFI mode.

components/nacl/browser/nacl_process_host.h

 // 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.
 
 #ifndef COMPONENTS_NACL_BROWSER_NACL_PROCESS_HOST_H_
 #define COMPONENTS_NACL_BROWSER_NACL_PROCESS_HOST_H_
 
 #include "build/build_config.h"
 
 #include "base/files/file_path.h"
 #include "base/files/file_util_proxy.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "base/message_loop/message_loop.h"
+#include "base/platform_file.h"
 #include "base/process/process.h"
 #include "components/nacl/common/nacl_types.h"
 #include "content/public/browser/browser_child_process_host_delegate.h"
 #include "content/public/browser/browser_child_process_host_iterator.h"
 #include "ipc/ipc_channel_handle.h"
 #include "net/socket/socket_descriptor.h"
 #include "ppapi/shared_impl/ppapi_permissions.h"
 #include "url/gurl.h"
 
 namespace content {
@@ skipping 28 matching lines @@
   //                          and mmap with PROT_EXEC.
   // enable_exception_handling: whether the launched process should allow
   //                            hardware exception handling.
   // enable_crash_throttling: whether a crash of this process contributes
   //                          to the crash throttling statistics, and also
   //                          whether this process should not start when too
   //                          many crashes have been observed.
   // off_the_record: was the process launched from an incognito renderer?
   // profile_directory: is the path of current profile directory.
   NaClProcessHost(const GURL& manifest_url,
+                  base::PlatformFile 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,
                   bool off_the_record,
                   const base::FilePath& profile_directory);
   virtual ~NaClProcessHost();
@@ skipping 104 matching lines @@
 
   // Called when the PPAPI IPC channels to the browser/renderer have been
   // created.
   void OnPpapiChannelsCreated(
       const IPC::ChannelHandle& browser_channel_handle,
       const IPC::ChannelHandle& ppapi_renderer_channel_handle,
       const IPC::ChannelHandle& trusted_renderer_channel_handle,
       const IPC::ChannelHandle& manifest_service_channel_handle);
 
   GURL manifest_url_;
+  base::PlatformFile nexe_file_;

[Mark Seaborn, 2014/06/17 00:50:30]

Should this use base::File instead of PlatformFile?

There have been some recent changes to do that transition:
https://src.chromium.org/viewvc/chrome?view=rev&revision=274783

base::File is auto-destroyed, I think.

[hidehiko, 2014/06/18 08:43:32]

Done.

+  uint64_t nexe_token_lo_;
+  uint64_t nexe_token_hi_;
+
   ppapi::PpapiPermissions permissions_;
 
 #if defined(OS_WIN)
   // This field becomes true when the broker successfully launched
   // the NaCl loader.
   bool process_launched_by_broker_;
 #endif
   // The NaClHostMessageFilter that requested this NaCl process.  We use
   // this for sending the reply once the process has started.
   scoped_refptr<NaClHostMessageFilter> nacl_host_message_filter_;
@@ skipping 39 matching lines @@
 
   // Throttling time in milliseconds for PpapiHostMsg_Keepalive IPCs.
   static unsigned keepalive_throttle_interval_milliseconds_;
 
   DISALLOW_COPY_AND_ASSIGN(NaClProcessHost);
 };
 
 }  // namespace nacl
 
 #endif  // COMPONENTS_NACL_BROWSER_NACL_PROCESS_HOST_H_