Revert 285028 "Pepper: Remove LOAD_MODULE SRPC call in SFI mode."

trunk/src/ppapi/native_client/src/trusted/plugin/service_runtime.h

Index: trunk/src/ppapi/native_client/src/trusted/plugin/service_runtime.h
===================================================================
--- trunk/src/ppapi/native_client/src/trusted/plugin/service_runtime.h	(revision 285116)
+++ trunk/src/ppapi/native_client/src/trusted/plugin/service_runtime.h	(working copy)
@@ -178,10 +178,11 @@
   // successfully or unsuccessfully).
   void SignalNexeStarted(bool ok);
 
-  // Establish an SrpcClient to the sel_ldr instance and start the nexe.
+  // Establish an SrpcClient to the sel_ldr instance and load the nexe.
+  // The nexe to be started is passed through |file_info|.
   // This function must be called on the main thread.
   // This function must only be called once.
-  void StartNexe();
+  void LoadNexeAndStart(PP_NaClFileInfo file_info);
 
   // Starts the application channel to the nexe.
   SrpcClient* SetupAppChannel();
@@ -203,10 +204,11 @@
 
  private:
   NACL_DISALLOW_COPY_AND_ASSIGN(ServiceRuntime);
-  bool StartNexeInternal();
+  bool LoadNexeAndStartInternal(const PP_NaClFileInfo& file_info);
 
   bool SetupCommandChannel();
   bool InitReverseService();
+  bool LoadModule(const PP_NaClFileInfo& file_info);
   bool StartModule();
   void ReapLogs();