Revert of Pepper: Refactor OpenManifestEntry.

ppapi/api/private/ppb_nacl_private.idl

 /* 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.
  */
 
 /* This file contains NaCl private interfaces. This interface is not versioned
  * and is for internal Chrome use. It may change without notice. */
 
 label Chrome {
   M25 = 1.0
@@ skipping 371 matching lines @@
   /* Returns the manifest url as passed as a plugin argument. */
   PP_Var GetManifestURLArgument([in] PP_Instance instance);
 
   PP_Bool DevInterfacesEnabled([in] PP_Instance instance);
 
   PP_Bool GetManifestProgramURL([in] PP_Instance instance,
                                 [out] PP_Var full_url,
                                 [out] PP_PNaClOptions pnacl_options,
                                 [out] 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([in] PP_Instance instance,
-                         [in] PP_Bool is_helper_process,
-                         [in] str_t key,
-                         [out] PP_NaClFileInfo file_info,
-                         [in] PP_CompletionCallback callback);
+  PP_Bool ManifestResolveKey([in] PP_Instance instance,
+                             [in] PP_Bool helper_process,
+                             [in] str_t key,
+                             [out] PP_Var full_url,
+                             [out] 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([in] PP_Instance instance,
                                [in] str_t filename,
                                [out] PP_Var llc_tool_name,
                                [out] PP_Var ld_tool_name);
 
   // PP_Var string of attributes describing the CPU features supported
@@ skipping 10 matching lines @@
 
   /* 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([in] PP_Instance instance,
                     [in] str_t url,
                     [out] PP_NaClFileInfo file_info,
                     [in] PP_CompletionCallback callback);
+
+  /* Downloads a non-nexe file specified in the manifest, and sets |file_info|
+   * to corresponding information about the file. */
+  void DownloadFile([in] PP_Instance instance,
+                    [in] str_t url,
+                    [out] PP_NaClFileInfo file_info,
+                    [in] PP_CompletionCallback callback);
 };