Pepper: Miscellaneous trusted plugin cleanup.

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 Fri May 30 10:50:23 2014. */
+/* From private/ppb_nacl_private.idl modified Wed Jun  4 09:50:07 2014. */
 
 #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 347 matching lines @@
    */
   PP_Bool (*NaClDebugEnabledForURL)(const char* alleged_nmf_url);
   /* Returns the kind of SFI sandbox implemented by NaCl on this
    * platform.
    */
   const char* (*GetSandboxArch)(void);
   /* Logs the message to the console. */
   void (*LogToConsole)(PP_Instance instance, const char* message);
   /* Returns the NaCl readiness status for this instance. */
   PP_NaClReadyState (*GetNaClReadyState)(PP_Instance instance);
-  /* Returns true if the plugin is an installed app. */
-  PP_Bool (*GetIsInstalled)(PP_Instance instance);
   /* Returns the exit status of the plugin process. */
   int32_t (*GetExitStatus)(PP_Instance instance);
   /* Sets the exit status of the plugin process. */
   void (*SetExitStatus)(PP_Instance instance, int32_t exit_status);
   /* Logs the message via VLOG. */
   void (*Vlog)(const char* message);
   /* Initializes internal state for a NaCl plugin. */
   void (*InitializePlugin)(PP_Instance instance,
                            uint32_t argc,
                            const char* argn[],
                            const char* argv[]);
   /* Returns the size of the nexe. */
   int64_t (*GetNexeSize)(PP_Instance instance);
-  /* Performs accounting for requesting the NaCl manifest at the given URL. */
+  /* Requests the NaCl manifest specified in the plugin arguments. */
   void (*RequestNaClManifest)(PP_Instance instance,
-                              const char* manifest_url,
                               struct PP_CompletionCallback callback);
   struct PP_Var (*GetManifestBaseURL)(PP_Instance instance);
   /* Processes the NaCl manifest once it's been retrieved.
    * TODO(teravest): Move the rest of the supporting logic out of the trusted
    * plugin.
    */
   void (*ProcessNaClManifest)(PP_Instance instance, const char* program_url);
-  /* Returns the manifest url as passed as a plugin argument. */
-  struct PP_Var (*GetManifestURLArgument)(PP_Instance instance);
   PP_Bool (*DevInterfacesEnabled)(PP_Instance instance);
   PP_Bool (*GetManifestProgramURL)(PP_Instance instance,
                                    struct PP_Var* full_url,
                                    struct PP_PNaClOptions* pnacl_options,
                                    PP_Bool* uses_nonsfi_mode);
   PP_Bool (*ManifestResolveKey)(PP_Instance instance,
                                 PP_Bool helper_process,
                                 const char* key,
                                 struct PP_Var* full_url,
                                 struct PP_PNaClOptions* pnacl_options);
@@ skipping 21 matching lines @@
   void (*DownloadNexe)(PP_Instance instance,
                        const char* url,
                        struct PP_NaClFileInfo* file_info,
                        struct PP_CompletionCallback callback);
   /* Downloads a non-nexe file specified in the manifest, and sets |file_info|
    * to corresponding information about the file. */
   void (*DownloadFile)(PP_Instance instance,
                        const char* url,
                        struct PP_NaClFileInfo* file_info,
                        struct PP_CompletionCallback callback);
+  /* Reports the status of sel_ldr for UMA reporting.
+   * |max_status| has to be provided because the implementation of this
+   * interface can't access the NaClErrorCode enum.
+   */
+  void (*ReportSelLdrStatus)(PP_Instance instance,
+                             int32_t load_status,
+                             int32_t max_status);
 };
 
 typedef struct PPB_NaCl_Private_1_0 PPB_NaCl_Private;
 /**
  * @}
  */
 
 #endif  /* PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_ */