Prototype: Use Chromium IPC for plugin LOAD_MODULE.

ppapi/native_client/src/trusted/plugin/plugin.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.
 
 // The portable representation of an instance and root scriptable object.
 // The PPAPI version of the plugin instantiates a subclass of this class.
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
@@ skipping 83 matching lines @@
   // mechanism(s) take over.
   //
   // Updates nacl_module_origin() and nacl_module_url().
   void LoadNaClModule(nacl::DescWrapper* wrapper,
                       bool enable_dyncode_syscalls,
                       bool enable_exception_handling,
                       bool enable_crash_throttling,
                       const pp::CompletionCallback& init_done_cb,
                       const pp::CompletionCallback& crash_cb);
 
+  void LoadNexeOnMainThread(int32_t pp_error,
+                            ServiceRuntime* service_runtime,
+                            nacl::DescWrapper* wrapper,
+                            const pp::CompletionCallback& crash_cb);
+
   // Finish hooking interfaces up, after low-level initialization is
   // complete.
   bool LoadNaClModuleContinuationIntern(ErrorInfo* error_info);
 
   // Continuation for starting SRPC/JSProxy services as appropriate.
   // This is invoked as a callback when the NaCl module makes the
   // init_done reverse RPC to tell us that low-level initialization
   // such as ld.so processing is done.  That initialization requires
   // that the main thread be free in order to do Pepper
   // main-thread-only operations such as file processing.
@@ skipping 179 matching lines @@
   void HistogramEnumerateOsArch(const std::string& sandbox_isa);
   void HistogramEnumerateLoadStatus(PluginErrorCode error_code,
                                     bool is_installed);
   void HistogramEnumerateSelLdrLoadStatus(NaClErrorCode error_code,
                                           bool is_installed);
   void HistogramEnumerateManifestIsDataURI(bool is_data_uri);
   void HistogramHTTPStatusCode(const std::string& name, int status);
 
   // Help load a nacl module, from the file specified in wrapper.
   // This will fully initialize the |subprocess| if the load was successful.
-  bool LoadNaClModuleCommon(nacl::DescWrapper* wrapper,
-                            NaClSubprocess* subprocess,
-                            const Manifest* manifest,
-                            bool should_report_uma,
-                            const SelLdrStartParams& params,
-                            const pp::CompletionCallback& init_done_cb,
-                            const pp::CompletionCallback& crash_cb);
+  bool LoadNaClModuleFromBackgroundThread(
+      nacl::DescWrapper* wrapper,
+      NaClSubprocess* subprocess,
+      const Manifest* manifest,
+      const SelLdrStartParams& params);
 
   // Start sel_ldr from the main thread, given the start params.
   // Sets |success| to true on success.
   // |pp_error| is set by CallOnMainThread (should be PP_OK).
   void StartSelLdrOnMainThread(int32_t pp_error,
                                ServiceRuntime* service_runtime,
                                const SelLdrStartParams& params,
-                               bool* success);
+                               PP_CompletionCallback callback);
+
+  void SignalStartSelLdrDone(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
   // with the sandbox on.
   void NexeFileDidOpen(int32_t pp_error);
   void NexeFileDidOpenContinuation(int32_t pp_error);
 
   // Callback used when the reverse channel closes.  This is an
   // asynchronous event that might turn into a JavaScript error or
   // crash event -- this is controlled by the two state variables
@@ skipping 71 matching lines @@
   char** argv_;
 
   // Keep track of the NaCl module subprocess that was spun up in the plugin.
   NaClSubprocess main_subprocess_;
 
   nacl::string plugin_base_url_;
   nacl::string manifest_base_url_;
   nacl::string manifest_url_;
   ReadyState nacl_ready_state_;
   bool nexe_error_reported_;  // error or crash reported
+  bool start_sel_ldr_success_;
 
   nacl::DescWrapperFactory* wrapper_factory_;
 
   // File download support.  |nexe_downloader_| can be opened with a specific
   // callback to run when the file has been downloaded and is opened for
   // reading.  We use one downloader for all URL downloads to prevent issuing
   // multiple GETs that might arrive out of order.  For example, this will
   // prevent a GET of a NaCl manifest while a .nexe GET is pending.  Note that
   // this will also prevent simultaneous handling of multiple .nexes on a page.
   FileDownloader nexe_downloader_;
@@ skipping 65 matching lines @@
   int64_t time_of_last_progress_event_;
   int exit_status_;
 
   const PPB_NaCl_Private* nacl_interface_;
   pp::UMAPrivate uma_interface_;
 };
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_