Pepper: Remove LOAD_MODULE SRPC call in SFI mode.

components/nacl/browser/nacl_process_host.h

Index: components/nacl/browser/nacl_process_host.h
diff --git a/components/nacl/browser/nacl_process_host.h b/components/nacl/browser/nacl_process_host.h
index a5e3e52c2997e0e26c8194ccdb1b75875f1496c4..e07bbfc893072283e1e38762a0130cd9a2522179 100644
--- a/components/nacl/browser/nacl_process_host.h
+++ b/components/nacl/browser/nacl_process_host.h
@@ -22,6 +22,8 @@
 #include "ppapi/shared_impl/ppapi_permissions.h"
 #include "url/gurl.h"
 
+struct NaClFileToken;
+
 namespace content {
 class BrowserChildProcessHost;
 class BrowserPpapiHost;
@@ -46,6 +48,8 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
  public:
   // manifest_url: the URL of the manifest of the Native Client plugin being
   // executed.
+  // nexe_file: A file that corresponds to the nexe module to be loaded.
+  // nexe_token: A cache validation token for nexe_file.
   // permissions: PPAPI permissions, to control access to private APIs.
   // render_view_id: RenderView routing id, to control access to private APIs.
   // permission_bits: controls which interfaces the NaCl plugin can use.
@@ -63,6 +67,7 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
   // profile_directory: is the path of current profile directory.
   NaClProcessHost(const GURL& manifest_url,
                   base::File nexe_file,
+                  const NaClFileToken& nexe_token,
                   ppapi::PpapiPermissions permissions,
                   int render_view_id,
                   uint32 permission_bits,
@@ -190,6 +195,11 @@ class NaClProcessHost : public content::BrowserChildProcessHostDelegate {
   GURL manifest_url_;
   base::File nexe_file_;
 
+  // TODO(teravest): Use NaClFileInfo here, but without breaking the

[Mark Seaborn, 2014/07/24 19:10:59]

Why is this necessary?  Is "native_client/src/public/nacl_file_info.h" not
#includable in the disable_nacl=1 build?  I thought native_client/ would still
be checked out when disable_nacl=1, or is that not the case?

+  // disable_nacl=1 build. (Why is this file even built with disable_nacl=1?)
+  uint64_t nexe_token_lo_;
+  uint64_t nexe_token_hi_;
+
   ppapi::PpapiPermissions permissions_;
 
 #if defined(OS_WIN)