Remove LoadModule SRPC for non-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 419 matching lines @@
 
   // Because the ownership of data is taken by caller, we must clear it
   // manually here. Otherwise, its dtor invokes callbacks again.
   data->Clear();
 }
 
 bool ServiceRuntime::SetupCommandChannel() {
   NaClLog(4, "ServiceRuntime::SetupCommand (this=%p, subprocess=%p)\n",
           static_cast<void*>(this),
           static_cast<void*>(subprocess_.get()));
+  if (uses_nonsfi_mode_) {
+    // In non-SFI mode, no SRPC is used. Just skips and returns success.
+    return true;
+  }
+
   if (!subprocess_->SetupCommand(&command_channel_)) {
     if (main_service_runtime_) {
       ErrorInfo error_info;
       error_info.SetReport(PP_NACL_ERROR_SEL_LDR_COMMUNICATION_CMD_CHANNEL,
                            "ServiceRuntime: command channel creation failed");
       plugin_->ReportLoadError(error_info);
     }
     return false;
   }
   return true;
 }
 
 void ServiceRuntime::LoadModule(PP_NaClFileInfo file_info,
                                 pp::CompletionCallback callback) {
+  if (uses_nonsfi_mode_) {
+    // In non-SFI mode, loading is done a part of LaunchSelLdr.
+    DidLoadModule(callback, PP_OK);
+    return;
+  }
+
   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) {
     DidLoadModule(callback, PP_ERROR_FAILED);
     return;
   }
 
@@ skipping 139 matching lines @@
   }
 
   ManifestService* manifest_service =
       new ManifestService(anchor_->Ref(), rev_interface_);
   bool enable_dev_interfaces =
       GetNaClInterface()->DevInterfacesEnabled(plugin_->pp_instance());
 
   tmp_subprocess->Start(plugin_->pp_instance(),
                         main_service_runtime_,
                         params.url.c_str(),
+                        &params.file_info,
                         params.uses_irt,
                         params.uses_ppapi,
                         uses_nonsfi_mode_,
                         enable_dev_interfaces,
                         params.enable_dyncode_syscalls,
                         params.enable_exception_handling,
                         params.enable_crash_throttling,
                         &kManifestServiceVTable,
                         manifest_service,
                         callback);
@@ skipping 146 matching lines @@
 
 nacl::string ServiceRuntime::GetCrashLogOutput() {
   if (NULL != subprocess_.get()) {
     return subprocess_->GetCrashLogOutput();
   } else {
     return std::string();
   }
 }
 
 }  // namespace plugin