Revert of Pepper: Refactor OpenManifestEntry.

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 Jun  3 08:33:15 2014. */
+/* From private/ppb_nacl_private.idl modified Fri May 30 10:50:23 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 379 matching lines @@
    * 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);
-  /* 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);
+  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|.
    */
   PP_Bool (*GetPnaclResourceInfo)(PP_Instance instance,
                                   const char* filename,
                                   struct PP_Var* llc_tool_name,
                                   struct PP_Var* ld_tool_name);
   /* PP_Var string of attributes describing the CPU features supported
    * by the current architecture. The string is a comma-delimited list
    * of attributes supported by LLVM in its -mattr= option:
    *   http://llvm.org/docs/CommandGuide/llc.html#cmdoption-mattr */
   struct PP_Var (*GetCpuFeatureAttrs)(void);
   /* Posts a message to the JavaScript object for the given instance.
    * This method may be called on any thread.
    */
   void (*PostMessageToJavaScript)(PP_Instance instance, const char* message);
   /* Downloads the .nexe file at the given URL to a file, and sets |file_info|
    * to information for a handle to a file containing its contents.
    * If metadata for identity-based validation caching is available
    * then it sets token information in |file_info| (otherwise left untouched).
    */
   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);
 };
 
 typedef struct PPB_NaCl_Private_1_0 PPB_NaCl_Private;
 /**
  * @}
  */
 
 #endif  /* PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_ */