Remove LoadModule SRPC for non-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 25 matching lines @@
 
 class OpenManifestEntryAsyncCallback;
 class Plugin;
 class SrpcClient;
 class ServiceRuntime;
 
 // Struct of params used by StartSelLdr.  Use a struct so that callback
 // creation templates aren't overwhelmed with too many parameters.
 struct SelLdrStartParams {
   SelLdrStartParams(const nacl::string& url,
+                    const PP_NaClFileInfo& file_info,
                     bool uses_irt,
                     bool uses_ppapi,
-                    bool uses_nonsfi_mode,

[Mark Seaborn, 2014/06/17 00:50:31]

Could you possibly do this removal in a separate change?

[hidehiko, 2014/06/18 08:43:32]

Done.

                     bool enable_dyncode_syscalls,
                     bool enable_exception_handling,
                     bool enable_crash_throttling)
       : url(url),
+        file_info(file_info),
         uses_irt(uses_irt),
         uses_ppapi(uses_ppapi),
-        uses_nonsfi_mode(uses_nonsfi_mode),
         enable_dyncode_syscalls(enable_dyncode_syscalls),
         enable_exception_handling(enable_exception_handling),
         enable_crash_throttling(enable_crash_throttling) {
   }
   nacl::string url;
+  PP_NaClFileInfo file_info;
   bool uses_irt;
   bool uses_ppapi;
-  bool uses_nonsfi_mode;
   bool enable_dev_interfaces;
   bool enable_dyncode_syscalls;
   bool enable_exception_handling;
   bool enable_crash_throttling;
 };
 
 // Callback resources are essentially our continuation state.
 struct OpenManifestEntryResource {
  public:
   OpenManifestEntryResource(const std::string& target_url,
@@ skipping 170 matching lines @@
   // Mutex and CondVar to protect start_sel_ldr_done_ and nexe_started_.
   NaClMutex mu_;
   NaClCondVar cond_;
   bool start_sel_ldr_done_;
   bool nexe_started_;
 };
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_SERVICE_RUNTIME_H_