NaCl: clean up nexe loading logic in trusted plugin.

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

Index: ppapi/native_client/src/trusted/plugin/service_runtime.h
diff --git a/ppapi/native_client/src/trusted/plugin/service_runtime.h b/ppapi/native_client/src/trusted/plugin/service_runtime.h
index 650aa3d59bcab17053ec45d56158d68fbd9e18f4..79840f4945c708753337bf8393287a5d775611d1 100644
--- a/ppapi/native_client/src/trusted/plugin/service_runtime.h
+++ b/ppapi/native_client/src/trusted/plugin/service_runtime.h
@@ -185,18 +185,16 @@ class ServiceRuntime {
 
   // If starting the nexe from a background thread, wait for the nexe to
   // actually start.
-  void WaitForNexeStart();
+  bool WaitForNexeStart();

[hidehiko, 2014/06/18 05:07:04]

Could you document the return value?

[Nick Bray (chromium), 2014/06/18 18:29:44]

Done.

 
   // Signal to waiting threads that LoadNexeAndStart is complete (either
   // successfully or unsuccessfully).
-  void SignalNexeStarted();
+  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|.
-  // Upon completion |callback| is invoked with status code.
   // This function must be called on the main thread.
-  void LoadNexeAndStart(PP_NaClFileInfo file_info,
-                        const pp::CompletionCallback& callback);
+  void LoadNexeAndStart(PP_NaClFileInfo file_info);
 
   // Starts the application channel to the nexe.
   SrpcClient* SetupAppChannel();
@@ -218,17 +216,12 @@ class ServiceRuntime {
 
  private:
   NACL_DISALLOW_COPY_AND_ASSIGN(ServiceRuntime);
-  struct LoadNexeAndStartData;
-  void LoadNexeAndStartAfterLoadModule(
-      LoadNexeAndStartData* data, int32_t pp_error);
-  void DidLoadNexeAndStart(LoadNexeAndStartData* data, int32_t pp_error);
+  bool LoadNexeAndStartInternal(PP_NaClFileInfo file_info);
 
   bool SetupCommandChannel();
   bool InitReverseService();
-  void LoadModule(PP_NaClFileInfo file_info,
-                  pp::CompletionCallback callback);
-  void DidLoadModule(pp::CompletionCallback callback, int32_t pp_error);
   bool StartModule();
+  void ReapLogs();
 
   NaClSrpcChannel command_channel_;
   Plugin* plugin_;
@@ -246,6 +239,7 @@ class ServiceRuntime {
   NaClCondVar cond_;
   bool start_sel_ldr_done_;
   bool nexe_started_;
+  bool nexe_started_ok_;
 };
 
 }  // namespace plugin