Pepper: Remove LOAD_MODULE SRPC call in SFI mode.

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

 /* -*- c++ -*- */
 /*
  * 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.
  */
 
 // A class containing information regarding a socket connection to a
 // service runtime instance.
 
@@ skipping 160 matching lines @@
 
   // If starting the nexe from a background thread, wait for the nexe to
   // actually start. Returns |true| is the nexe started successfully.
   bool WaitForNexeStart();
 
   // Signal to waiting threads that LoadNexeAndStart is complete (either
   // successfully or unsuccessfully).
   void SignalNexeStarted(bool ok);
 
   // 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 LoadNexeAndStart(PP_NaClFileInfo file_info);
+  void LoadNexeAndStart();
 
   // Starts the application channel to the nexe.
   SrpcClient* SetupAppChannel();
 
   bool RemoteLog(int severity, const nacl::string& msg);
   Plugin* plugin() const { return plugin_; }
   void Shutdown();
 
   // exit_status is -1 when invalid; when we set it, we will ensure
   // that it is non-negative (the portion of the exit status from the
   // nexe that is transferred is the low 8 bits of the argument to the
   // exit syscall).
   int exit_status();  // const, but grabs mutex etc.
   void set_exit_status(int exit_status);
 
   nacl::string GetCrashLogOutput();
 
   bool main_service_runtime() const { return main_service_runtime_; }
 
  private:
   NACL_DISALLOW_COPY_AND_ASSIGN(ServiceRuntime);
-  bool LoadNexeAndStartInternal(const PP_NaClFileInfo& file_info);
+  bool LoadNexeAndStartInternal();
 
   bool SetupCommandChannel();
   bool InitReverseService();
   bool LoadModule(const PP_NaClFileInfo& file_info);

[jvoung (off chromium), 2014/06/30 21:55:14]

prototype unused now?

[teravest, 2014/07/01 17:48:34]

Removed.

   bool StartModule();
   void ReapLogs();
 
   void ReportLoadError(const ErrorInfo& error_info);
 
   NaClSrpcChannel command_channel_;
   Plugin* plugin_;
   PP_Instance pp_instance_;
   bool main_service_runtime_;
   bool uses_nonsfi_mode_;
   nacl::ReverseService* reverse_service_;
   nacl::scoped_ptr<nacl::SelLdrLauncherBase> subprocess_;
 
   nacl::WeakRefAnchor* anchor_;
 
   PluginReverseInterface* rev_interface_;
 
   // Mutex and CondVar to protect start_sel_ldr_done_ and nexe_started_.
   NaClMutex mu_;
   NaClCondVar cond_;
   bool start_sel_ldr_done_;
   bool start_nexe_done_;
   bool nexe_started_ok_;
 };
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_