Pepper: Simplify manifest download logic.

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 361 matching lines @@
   /* Initializes internal state for a NaCl plugin. */
   void InitializePlugin([in] PP_Instance instance,
                         [in] uint32_t argc,
                         [in, size_as=argc] str_t[] argn,
                         [in, size_as=argv] str_t[] argv);
 
   /* Returns the size of the nexe. */
   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.
    */
   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);
 
   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,
                              [in] str_t manifest_data);
 
   void DestroyManifest([in] PP_Instance instance,
                        [in] int32_t manifest_id);
 
   PP_Bool GetManifestProgramURL([in] PP_Instance instance,
                                 [in] int32_t manifest_id,
@@ skipping 20 matching lines @@
   // of attributes supported by LLVM in its -mattr= option:
   //   http://llvm.org/docs/CommandGuide/llc.html#cmdoption-mattr
   PP_Var GetCpuFeatureAttrs();
 
   /* Posts a message to the JavaScript object for the given instance.
    * This method may be called on any thread.
    */
   void PostMessageToJavaScript([in] PP_Instance instance,
                                [in] str_t message);
 };