Pepper: Remove LOAD_MODULE SRPC call in SFI mode.

ppapi/native_client/src/trusted/plugin/service_runtime.cc

Index: ppapi/native_client/src/trusted/plugin/service_runtime.cc
diff --git a/ppapi/native_client/src/trusted/plugin/service_runtime.cc b/ppapi/native_client/src/trusted/plugin/service_runtime.cc
index fbbd781df3d006fe4524b4be63cd1d8b84a77fc2..7802af30b1f7aa4711af327b0aa42c72c7ab3311 100644
--- a/ppapi/native_client/src/trusted/plugin/service_runtime.cc
+++ b/ppapi/native_client/src/trusted/plugin/service_runtime.cc
@@ -466,16 +466,10 @@ void ServiceRuntime::SignalNexeStarted(bool ok) {
   NaClXCondVarSignal(&cond_);
 }
 
-void ServiceRuntime::LoadNexeAndStart(PP_NaClFileInfo file_info) {
-  NaClLog(4, "ServiceRuntime::LoadNexeAndStart (handle_valid=%d "
-             "token_lo=%" NACL_PRIu64 " token_hi=%" NACL_PRIu64 ")\n",
-      file_info.handle != PP_kInvalidFileHandle,
-      file_info.token_lo,
-      file_info.token_hi);
-
-  bool ok = LoadNexeAndStartInternal(file_info);
+void ServiceRuntime::StartNexe() {
+  bool ok = StartNexeInternal();
   if (ok) {
-    NaClLog(4, "ServiceRuntime::LoadNexeAndStart (success)\n");
+    NaClLog(4, "ServiceRuntime::StartNexe (success)\n");
   } else {
     ReapLogs();
   }
@@ -484,47 +478,12 @@ void ServiceRuntime::LoadNexeAndStart(PP_NaClFileInfo file_info) {
   SignalNexeStarted(ok);
 }
 
-bool ServiceRuntime::LoadNexeAndStartInternal(
-    const PP_NaClFileInfo& file_info) {
-  if(!SetupCommandChannel()) {
+bool ServiceRuntime::StartNexeInternal() {
+  if (!SetupCommandChannel())
     return false;
-  }
-  if (!InitReverseService()) {
-    return false;
-  }
-  if (!LoadModule(file_info)) {
-    ErrorInfo error_info;
-    error_info.SetReport(PP_NACL_ERROR_SEL_LDR_COMMUNICATION_CMD_CHANNEL,
-                         "ServiceRuntime: load module failed");
-    ReportLoadError(error_info);
-    return false;
-  }
-  if (!StartModule()) {
-    return false;
-  }
-  return true;
-}
-
-bool ServiceRuntime::LoadModule(const PP_NaClFileInfo& file_info) {
-  if (uses_nonsfi_mode_) {
-    // In non-SFI mode, loading is done a part of LaunchSelLdr.
-    return true;
-  }
-
-  NaClFileInfo nacl_file_info;
-  nacl_file_info.desc = ConvertFileDescriptor(file_info.handle, true);
-  nacl_file_info.file_token.lo = file_info.token_lo;
-  nacl_file_info.file_token.hi = file_info.token_hi;
-  NaClDesc* desc = NaClDescIoFromFileInfo(nacl_file_info, O_RDONLY);
-  if (desc == NULL) {
+  if (!InitReverseService())
     return false;
-  }
-  // We don't use a scoped_ptr here since we would immediately release the
-  // DescWrapper to LoadModule().
-  nacl::DescWrapper* wrapper =
-    plugin_->wrapper_factory()->MakeGenericCleanup(desc);
-  // TODO(teravest, hidehiko): Replace this by Chrome IPC.
-  return subprocess_->LoadModule(&command_channel_, wrapper);
+  return StartModule();
 }
 
 void ServiceRuntime::ReapLogs() {