Pepper: Simplify manifest download logic.

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 May 13 11:00:06 2014. */
+/* From private/ppb_nacl_private.idl modified Wed May 14 11:49:42 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 360 matching lines @@
   /* Logs the message via VLOG. */
   void (*Vlog)(const char* message);
   /* Initializes internal state for a NaCl plugin. */
   void (*InitializePlugin)(PP_Instance instance,
                            uint32_t argc,
                            const char* argn[],
                            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. */
-  PP_Bool (*RequestNaClManifest)(PP_Instance instance,
-                                 const char* manifest_url,
-                                 PP_Bool* is_data_uri);
+  void (*RequestNaClManifest)(PP_Instance instance,
+                              const char* manifest_url,
+                              struct PP_Var* manifest_data,
+                              struct PP_CompletionCallback callback);
   struct PP_Var (*GetManifestBaseURL)(PP_Instance instance);
   PP_Bool (*ResolvesRelativeToPluginBaseUrl)(PP_Instance instance,
                                              const char* url);
-  /* Returns the parsed contents of a data URL. */
-  struct PP_Var (*ParseDataURL)(const char* data_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)(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);
-  /* Downloads the manifest into the buffer |data|, invoking
-   * |callback| when finished.
-   * TODO(teravest): Merge data URL parsing into this. */
-  void (*DownloadManifestToBuffer)(PP_Instance instance,
-                                   struct PP_Var* data,
-                                   struct PP_CompletionCallback callback);
   int32_t (*CreatePnaclManifest)(PP_Instance instance);
   int32_t (*CreateJsonManifest)(PP_Instance instance,
                                 const char* manifest_base_url,
                                 const char* manifest_data);
   void (*DestroyManifest)(PP_Instance instance, int32_t manifest_id);
   PP_Bool (*GetManifestProgramURL)(PP_Instance instance,
                                    int32_t manifest_id,
                                    struct PP_Var* full_url,
                                    struct PP_PNaClOptions* pnacl_options,
                                    PP_Bool* uses_nonsfi_mode);
@@ skipping 20 matching lines @@
   void (*PostMessageToJavaScript)(PP_Instance instance, const char* message);
 };
 
 typedef struct PPB_NaCl_Private_1_0 PPB_NaCl_Private;
 /**
  * @}
  */
 
 #endif  /* PPAPI_C_PRIVATE_PPB_NACL_PRIVATE_H_ */