Pepper: Remove LOAD_MODULE SRPC call in SFI mode.

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

 /*
  * 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.
  */
 
 #define NACL_LOG_MODULE_NAME "Plugin_ServiceRuntime"
 
 #include "ppapi/native_client/src/trusted/plugin/service_runtime.h"
 
@@ skipping 441 matching lines @@
   return nexe_started_ok_;
 }
 
 void ServiceRuntime::SignalNexeStarted(bool ok) {
   nacl::MutexLocker take(&mu_);
   start_nexe_done_ = true;
   nexe_started_ok_ = 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();
   }
   // This only matters if a background thread is waiting, but we signal in all
   // cases to simplify the code.
   SignalNexeStarted(ok);
 }
 
-bool ServiceRuntime::LoadNexeAndStartInternal(
-    const PP_NaClFileInfo& file_info) {
-  if(!SetupCommandChannel()) {
+bool ServiceRuntime::StartNexeInternal() {
+  if (!SetupCommandChannel())
     return false;
-  }
-  if (!InitReverseService()) {
+  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) {
-    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() {
   // On a load failure the service runtime does not crash itself to
   // avoid a race where the no-more-senders error on the reverse
   // channel service thread might cause the crash-detection logic to
   // kick in before the start_module RPC reply has been received. So
   // we induce a service runtime crash here. We do not release
   // subprocess_ since it's needed to collect crash log output after
   // the error is reported.
@@ skipping 93 matching lines @@
 
 nacl::string ServiceRuntime::GetCrashLogOutput() {
   if (NULL != subprocess_.get()) {
     return subprocess_->GetCrashLogOutput();
   } else {
     return std::string();
   }
 }
 
 }  // namespace plugin