PNaCl on-demand installs: Make a separate async IPC to check if PNaCl is installed

ppapi/c/private/ppb_nacl_private.h

 /* 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.
  */
 
-/* From private/ppb_nacl_private.idl modified Tue Jul 23 13:16:52 2013. */
+/* From private/ppb_nacl_private.idl modified Mon Jul 29 16:44:58 2013. */
 
 #ifndef PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_
 #define PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_
 
 #include "ppapi/c/pp_bool.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_instance.h"
 #include "ppapi/c/pp_macros.h"
 #include "ppapi/c/pp_stdint.h"
 #include "ppapi/c/pp_var.h"
@@ skipping 26 matching lines @@
 /**
  * @}
  */
 
 /**
  * @addtogroup Interfaces
  * @{
  */
 /* PPB_NaCl_Private */
 struct PPB_NaCl_Private_1_0 {
-  /* Launches NaCl's sel_ldr process.  Returns PP_NACL_OK on success and
-   * writes a NaClHandle to imc_handle. Returns PP_NACL_FAILED on failure.
-   * The |enable_ppapi_dev| parameter controls whether GetInterface
+  /* Launches NaCl's sel_ldr process.  Returns PP_EXTERNAL_PLUGIN_OK on success
+   * and writes a NaClHandle to imc_handle. Returns PP_EXTERNAL_PLUGIN_FAILED on
+   * failure. The |enable_ppapi_dev| parameter controls whether GetInterface
    * returns 'Dev' interfaces to the NaCl plugin.  The |uses_ppapi| flag
    * indicates that the nexe run by sel_ldr will use the PPAPI APIs.
    * This implies that LaunchSelLdr is run from the main thread.  If a nexe
    * does not need PPAPI, then it can run off the main thread.
    * The |uses_irt| flag indicates whether the IRT should be loaded in this
    * NaCl process.  This is true for ABI stable nexes.
    * The |enable_dyncode_syscalls| flag indicates whether or not the nexe
    * will be able to use dynamic code system calls (e.g., mmap with PROT_EXEC).
    * The |enable_exception_handling| flag indicates whether or not the nexe
    * will be able to use hardware exception handling.
    */
   PP_ExternalPluginResult (*LaunchSelLdr)(PP_Instance instance,
                                           const char* alleged_url,
                                           PP_Bool uses_irt,
                                           PP_Bool uses_ppapi,
                                           PP_Bool enable_ppapi_dev,
                                           PP_Bool enable_dyncode_syscalls,
                                           PP_Bool enable_exception_handling,
                                           void* imc_handle,
                                           struct PP_Var* error_message);
   /* This function starts the IPC proxy so the nexe can communicate with the
-   * browser. Returns PP_NACL_OK on success, otherwise a result code indicating
-   * the failure. PP_NACL_FAILED is returned if LaunchSelLdr wasn't called with
-   * the instance. PP_NACL_ERROR_MODULE is returned if the module can't be
-   * initialized. PP_NACL_ERROR_INSTANCE is returned if the instance can't be
-   * initialized. PP_NACL_USE_SRPC is returned if the plugin should use SRPC.
+   * browser. Returns PP_EXTERNAL_PLUGIN_OK on success, otherwise a result code
+   * indicating the failure. PP_EXTERNAL_PLUGIN_FAILED is returned if
+   * LaunchSelLdr wasn't called with the instance.
+   * PP_EXTERNAL_PLUGIN_ERROR_MODULE is returned if the module can't be
+   * initialized. PP_EXTERNAL_PLUGIN_ERROR_INSTANCE is returned if the instance
+   * can't be initialized.
    */
   PP_ExternalPluginResult (*StartPpapiProxy)(PP_Instance instance);
   /* On POSIX systems, this function returns the file descriptor of
    * /dev/urandom.  On non-POSIX systems, this function returns 0.
    */
   int32_t (*UrandomFD)(void);
   /* Whether the Pepper 3D interfaces should be disabled in the NaCl PPAPI
    * proxy. This is so paranoid admins can effectively prevent untrusted shader
    * code to be processed by the graphics stack.
    */
   PP_Bool (*Are3DInterfacesDisabled)(void);
   /* This is Windows-specific.  This is a replacement for DuplicateHandle() for
    * use inside the Windows sandbox.  Note that we provide this via dependency
    * injection only to avoid the linkage problems that occur because the NaCl
    * plugin is built as a separate DLL/DSO
    * (see http://code.google.com/p/chromium/issues/detail?id=114439#c8).
    */
   int32_t (*BrokerDuplicateHandle)(PP_FileHandle source_handle,
                                    uint32_t process_id,
                                    PP_FileHandle* target_handle,
                                    uint32_t desired_access,
                                    uint32_t options);
+  /* Check if PNaCl is installed and attempt to install if necessary.
+   * Callback is called when the check is done and PNaCl is already installed,
+   * or after an on-demand install is attempted. Called back with PP_OK if
+   * PNaCl is available. Called back with an error otherwise.
+   */
+  int32_t (*EnsurePnaclInstalled)(PP_Instance instance,
+                                  struct PP_CompletionCallback callback);
   /* Returns a read-only file descriptor of a file rooted in the Pnacl
    * component directory, or an invalid handle on failure.
-   * Do we want this to take a completion callback and be async, or
-   * could we make this happen on another thread?
    */
   PP_FileHandle (*GetReadonlyPnaclFd)(const char* filename);
   /* This creates a temporary file that will be deleted by the time
    * the last handle is closed (or earlier on POSIX systems), and
    * returns a posix handle to that temporary file.
    */
   PP_FileHandle (*CreateTemporaryFile)(PP_Instance instance);
   /* Create a temporary file, which will be deleted by the time the last
    * handle is closed (or earlier on POSIX systems), to use for the nexe
    * with the cache information given by |pexe_url|, |abi_version|, |opt_level|,
@@ skipping 43 matching lines @@
                                       uint64_t* file_token_hi);
 };
 
 typedef struct PPB_NaCl_Private_1_0 PPB_NaCl_Private;
 /**
  * @}
  */
 
 #endif  /* PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_ */