Pepper: Miscellaneous trusted plugin cleanup.

This removes some more unnecessary methods and moves some more UMA reporting
out of the trusted plugin, reducing the total line count.

It's a little awkward that we have to pass the max value of NaClErrorCode to
the new reporting method, but it keeps that enum out of the public NaCl
interface.

BUG=239656
R=dmichael@chromium.org

Review URL: https://codereview.chromium.org/315753003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@274898 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 9 insertions, 7 deletions

diff --git a/ppapi/c/private/ppb_nacl_private.h b/ppapi/c/private/ppb_nacl_private.h
index bc253cc..69301ef 100644
--- a/ppapi/c/private/ppb_nacl_private.h
+++ b/ppapi/c/private/ppb_nacl_private.h
@@ -3,7 +3,7 @@
  * 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_
@@ -371,8 +371,6 @@ struct PPB_NaCl_Private_1_0 {
   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. */
@@ -386,9 +384,8 @@ struct PPB_NaCl_Private_1_0 {
                            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.
@@ -396,8 +393,6 @@ struct PPB_NaCl_Private_1_0 {
    * 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,
@@ -439,6 +434,13 @@ struct PPB_NaCl_Private_1_0 {
                        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;