Pepper: Move StreamAsFile out of trusted plugin.

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 148 matching lines @@
 
   /* Called when irt_open_resource() is invoked in the NaCl plugin.
    * Upon completion, callback will be invoked with given callback_user_data
    * and the result file handle (or PP_kInvalidFileHandle on error). */
   PP_Bool OpenResource([inout] mem_t user_data,
                        [in] str_t entry_key,
                        [in] PP_OpenResourceCompletionCallback callback,
                        [inout] mem_t callback_user_data);
 };
 
+/* Corresponds to NaClFileInfo in
+ * native_client/src/trusted/validator/nacl_file_info.h */
+struct PP_NaClFileInfo {
+  PP_FileHandle handle;
+
+  /* See NaClFileToken comment in nacl_file_info.h */
+  uint64_t token_lo;
+  uint64_t token_hi;
+};
+
 /* PPB_NaCl_Private */
 interface PPB_NaCl_Private {
   /* Launches NaCl's sel_ldr process.  Returns PP_EXTERNAL_PLUGIN_OK on success
    * and writes a NaClHandle to imc_handle. Returns PP_EXTERNAL_PLUGIN_FAILED on
    * failure. The |enable_ppapi_dev| parameter controls whether GetInterface
    * returns 'Dev' interfaces to the NaCl plugin.  The |uses_ppapi| flag
    * indicates that the nexe run by sel_ldr will use the PPAPI APIs.
    * This implies that LaunchSelLdr is run from the main thread.  If a nexe
    * does not need PPAPI, then it can run off the main thread.
    * The |uses_irt| flag indicates whether the IRT should be loaded in this
@@ skipping 95 matching lines @@
    * browser may then store the translation in the cache. The renderer
    * must first have called GetNexeFd for the same instance. (The browser is
    * not guaranteed to store the nexe even if |success| is true; if there is
    * an error on the browser side, or the file is too big for the cache, or
    * the browser is in incognito mode, no notification will be delivered to
    * the plugin.)
    */
   void ReportTranslationFinished([in] PP_Instance instance,
                                  [in] PP_Bool success);
 
-  /* Opens a NaCl executable file in the application's extension directory
-   * corresponding to the file URL and returns a file descriptor, or an invalid
-   * handle on failure. |metadata| is left unchanged on failure.
-   */
-  PP_FileHandle OpenNaClExecutable([in] PP_Instance instance,
-                                   [in] str_t file_url,
-                                   [out] uint64_t file_token_lo,
-                                   [out] uint64_t file_token_hi);
-
-
   /* Dispatch a progress event on the DOM element where the given instance is
    * embedded.
    */
   void DispatchEvent([in] PP_Instance instance,
                      [in] PP_NaClEventType event_type,
                      [in] str_t resource_url,
                      [in] PP_Bool length_is_computable,
                      [in] uint64_t loaded_bytes,
                      [in] uint64_t total_bytes);
 
@@ skipping 62 matching lines @@
   int64_t GetNexeSize([in] PP_Instance instance);
 
   /* Performs accounting for requesting the NaCl manifest at the given URL. */
   void RequestNaClManifest([in] PP_Instance instance,
                            [in] str_t manifest_url,
                            [out] int32_t manifest_id,
                            [in] PP_CompletionCallback callback);
 
   PP_Var GetManifestBaseURL([in] PP_Instance instance);
 
-  PP_Bool ResolvesRelativeToPluginBaseUrl([in] PP_Instance instance,
-                                          [in] str_t url);
-
   /* 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([in] PP_Instance instance,
                            [in] str_t program_url);
 
   /* Returns the manifest url as passed as a plugin argument. */
   PP_Var GetManifestURLArgument([in] PP_Instance instance);
 
@@ skipping 40 matching lines @@
    * to a handle to a file containing its contents.
    * If metadata for identity-based validation caching is available
    * then it sets file_token_lo and file_token_lo (otherwise left untouched).
    */
   void DownloadNexe([in] PP_Instance instance,
                     [in] str_t url,
                     [out] PP_FileHandle handle,
                     [out] uint64_t file_token_lo,
                     [out] uint64_t file_token_hi,
                     [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);
 };