Pepper: Refactor OpenManifestEntry.

This change pulls out more OpenManifestEntry code from service_runtime, making
PPB_NaCl_Private a smallter interface, and preparing for pulling all of that
logic out of the trusted plugin.

An earlier version of this change was reverted after breaking Non-SFI mode, but
the Non-SFI case no longer uses this codepath.

CQ_EXTRA_TRYBOTS=tryserver.chromium:linux_rel_precise32
BUG=239656

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

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

1 files changed, 11 insertions, 12 deletions

diff --git a/ppapi/c/private/ppb_nacl_private.h b/ppapi/c/private/ppb_nacl_private.h
index 8a045c1..3f85066 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 Mon Jun 23 12:23:23 2014. */
+/* From private/ppb_nacl_private.idl modified Wed Jun 25 11:40:03 2014. */
 
 #ifndef PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_
 #define PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_
@@ -399,11 +399,6 @@ struct PPB_NaCl_Private_1_0 {
                                    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);
   /* Returns the filenames for the llc and ld tools, parsing that information
    * from the file given in |filename|.
    */
@@ -429,12 +424,6 @@ struct PPB_NaCl_Private_1_0 {
                        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.
@@ -446,6 +435,16 @@ struct PPB_NaCl_Private_1_0 {
    * This function is safe to call on any thread.
    */
   void (*LogTranslateTime)(const char* histogram_name, int64_t time_us);
+  /* Opens a manifest entry for the given instance. If this is for a helper
+   * process, we consult our internal pnacl.json instead of the user-supplied
+   * NMF.
+   * Fails for files which require PNaCl translation.
+   */
+  void (*OpenManifestEntry)(PP_Instance instance,
+                            PP_Bool is_helper_process,
+                            const char* key,
+                            struct PP_NaClFileInfo* file_info,
+                            struct PP_CompletionCallback callback);
 };
 
 typedef struct PPB_NaCl_Private_1_0 PPB_NaCl_Private;