Index: ppapi/native_client/src/trusted/plugin/plugin.h |
diff --git a/ppapi/native_client/src/trusted/plugin/plugin.h b/ppapi/native_client/src/trusted/plugin/plugin.h |
index 721018c8d9e95721d3937b09399ede06efbf249c..ce3273dd2cb88f8572c3456725c5431398030944 100644 |
--- a/ppapi/native_client/src/trusted/plugin/plugin.h |
+++ b/ppapi/native_client/src/trusted/plugin/plugin.h |
@@ -147,13 +147,12 @@ class Plugin : public pp::Instance { |
// uma_interface_ normally. |
void HistogramTimeSmall(const std::string& name, int64_t ms); |
- // Load a nacl module from the file specified in file_info. |
+ // Loads and starts a helper (e.g. llc, ld) NaCl module. |
// Only to be used from a background (non-main) thread for the PNaCl |
// translator. This will fully initialize the |subprocess| if the load was |
// successful. |
- bool LoadHelperNaClModule(PP_NaClFileInfo file_info, |
- NaClSubprocess* subprocess, |
- const SelLdrStartParams& params); |
+ bool LoadHelperNaClModuleInternal(NaClSubprocess* subprocess, |
+ const SelLdrStartParams& params); |
// Start sel_ldr from the main thread, given the start params. |
// |pp_error| is set by CallOnMainThread (should be PP_OK). |
@@ -169,9 +168,7 @@ class Plugin : public pp::Instance { |
ServiceRuntime* service_runtime); |
// This is invoked on the main thread. |
- void LoadNexeAndStart(int32_t pp_error, |
- ServiceRuntime* service_runtime, |
- PP_NaClFileInfo file_info); |
+ void StartNexe(int32_t pp_error, ServiceRuntime* service_runtime); |
// Callback used when getting the URL for the .nexe file. If the URL loading |
// is successful, the file descriptor is opened and can be passed to sel_ldr |