Pepper: Simplify manifest download logic.

ppapi/api/private/ppb_nacl_private.idl

Index: ppapi/api/private/ppb_nacl_private.idl
diff --git a/ppapi/api/private/ppb_nacl_private.idl b/ppapi/api/private/ppb_nacl_private.idl
index 71d1fc4bb6fecb54b013334d95afc6c8f805b44d..ce4719f2efc1333ad4d513d347890fd3137420ed 100644
--- a/ppapi/api/private/ppb_nacl_private.idl
+++ b/ppapi/api/private/ppb_nacl_private.idl
@@ -379,18 +379,16 @@ interface PPB_NaCl_Private {
   int64_t GetNexeSize([in] PP_Instance instance);
 
   /* Performs accounting for requesting the NaCl manifest at the given URL. */
-  PP_Bool RequestNaClManifest([in] PP_Instance instance,
-                              [in] str_t manifest_url,
-                              [out] PP_Bool is_data_uri);
+  void RequestNaClManifest([in] PP_Instance instance,
+                           [in] str_t manifest_url,
+                           [out] PP_Var manifest_data,
+                           [in] PP_CompletionCallback callback);
 
   PP_Var GetManifestBaseURL([in] PP_Instance instance);
 
   PP_Bool ResolvesRelativeToPluginBaseUrl([in] PP_Instance instance,
                                           [in] str_t url);
 
-  /* Returns the parsed contents of a data URL. */
-  PP_Var ParseDataURL([in] str_t 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.
@@ -403,13 +401,6 @@ interface PPB_NaCl_Private {
 
   PP_Bool DevInterfacesEnabled([in] PP_Instance instance);
 
-  /* Downloads the manifest into the buffer |data|, invoking
-   * |callback| when finished.
-   * TODO(teravest): Merge data URL parsing into this. */
-  void DownloadManifestToBuffer([in] PP_Instance instance,
-                                [out] PP_Var data,
-                                [in] PP_CompletionCallback callback);
-
   int32_t CreatePnaclManifest([in] PP_Instance instance);
   int32_t CreateJsonManifest([in] PP_Instance instance,
                              [in] str_t manifest_base_url,