Pepper: Move StreamAsFile out of trusted plugin.

ppapi/native_client/src/trusted/plugin/plugin.h

 // -*- c++ -*-
 // 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.
 
 // The portable representation of an instance and root scriptable object.
 // The PPAPI version of the plugin instantiates a subclass of this class.
 
 #ifndef NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
 #define NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_
@@ skipping 32 matching lines @@
 class CompletionCallback;
 class URLLoader;
 class URLUtil_Dev;
 }
 
 namespace plugin {
 
 class ErrorInfo;
 class Manifest;
 
+int32_t ConvertFileDescriptor(PP_FileHandle handle);
+
 class Plugin : public pp::Instance {
  public:
   explicit Plugin(PP_Instance instance);
 
   // ----- Methods inherited from pp::Instance:
 
   // Initializes this plugin with <embed/object ...> tag attribute count |argc|,
   // names |argn| and values |argn|. Returns false on failure.
   // Gets called by the browser right after New().
   virtual bool Init(uint32_t argc, const char* argn[], const char* argv[]);
@@ skipping 78 matching lines @@
 
   nacl::DescWrapperFactory* wrapper_factory() const { return wrapper_factory_; }
 
   // Requests a NaCl manifest download from a |url| relative to the page origin.
   void RequestNaClManifest(const nacl::string& url);
 
   // Called back by CallOnMainThread.  Dispatches the first enqueued progress
   // event.
   void DispatchProgressEvent(int32_t result);
 
-  // Requests a URL asynchronously resulting in a call to pp_callback with
-  // a PP_Error indicating status.
-  bool StreamAsFile(const nacl::string& url,
-                    NaClFileInfo *out_file_info,
+  // Requests a URL asynchronously, resulting in a call to |callback| with
+  // an error code indicating status. On success, writes file information to
+  // |file_info|.
+  void StreamAsFile(const nacl::string& url,
+                    PP_NaClFileInfo* file_info,
                     const pp::CompletionCallback& callback);
 
   // A helper function that indicates if |url| can be requested by the document
   // under the same-origin policy. Strictly speaking, it may be possible for the
   // document to request the URL using CORS even if this function returns false.
   bool DocumentCanRequest(const std::string& url);
 
   // set_exit_status may be called off the main thread.
   void set_exit_status(int exit_status);
 
@@ skipping 75 matching lines @@
   void NaClManifestFileDidOpen(int32_t pp_error);
 
   // Processes the JSON manifest string and starts loading the nexe.
   void ProcessNaClManifest(const nacl::string& manifest_json);
 
   // Logs timing information to a UMA histogram, and also logs the same timing
   // information divided by the size of the nexe to another histogram.
   void HistogramStartupTimeSmall(const std::string& name, float dt);
   void HistogramStartupTimeMedium(const std::string& name, float dt);
 
-  // Callback used when loading a URL for SRPC-based StreamAsFile().
-  void UrlDidOpenForStreamAsFile(int32_t pp_error,
-                                 FileDownloader* url_downloader,
-                                 NaClFileInfo* out_file_info,
-                                 pp::CompletionCallback pp_callback);
-
-  // Open an app file by requesting a file descriptor from the browser. This
-  // method first checks that the url is for an installed file before making the
-  // request so it won't slow down non-installed file downloads.
-  bool OpenURLFast(const nacl::string& url, FileDownloader* downloader);
-
   void SetExitStatusOnMainThread(int32_t pp_error, int exit_status);
 
   // Keep track of the NaCl module subprocess that was spun up in the plugin.
   NaClSubprocess main_subprocess_;
 
   bool uses_nonsfi_mode_;
 
   nacl::DescWrapperFactory* wrapper_factory_;
 
   // Original, unresolved URL for the .nexe program to load.
   std::string program_url_;
 
   pp::CompletionCallbackFactory<Plugin> callback_factory_;
 
   nacl::scoped_ptr<PnaclCoordinator> pnacl_coordinator_;
 
-  // Keep track of the FileDownloaders created to fetch urls.
-  std::set<FileDownloader*> url_downloaders_;
-
-  // Callback to receive .nexe and .dso download progress notifications.
-  static void UpdateDownloadProgress(
-      PP_Instance pp_instance,
-      PP_Resource pp_resource,
-      int64_t bytes_sent,
-      int64_t total_bytes_to_be_sent,
-      int64_t bytes_received,
-      int64_t total_bytes_to_be_received);
-
-  // Finds the file downloader which owns the given URL loader. This is used
-  // in UpdateDownloadProgress to map a url loader back to the URL being
-  // downloaded.
-  const FileDownloader* FindFileDownloader(PP_Resource url_loader) const;
-
   int64_t time_of_last_progress_event_;
   int exit_status_;
 
   int32_t manifest_id_;
 
   PP_FileHandle nexe_handle_;
   uint64_t nexe_token_lo_;
   uint64_t nexe_token_hi_;
 
   const PPB_NaCl_Private* nacl_interface_;
   pp::UMAPrivate uma_interface_;
 };
 
 }  // namespace plugin
 
 #endif  // NATIVE_CLIENT_SRC_TRUSTED_PLUGIN_PLUGIN_H_