Pepper: Move StreamAsFile out of trusted plugin.

ppapi/native_client/src/trusted/plugin/file_downloader.cc

 // 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.
 
 #include "ppapi/native_client/src/trusted/plugin/file_downloader.h"
 
 #include <stdio.h>
 #include <string.h>
 #include <string>
 
@@ skipping 12 matching lines @@
 
 namespace {
 
 struct NaClFileInfo NoFileInfo() {
   struct NaClFileInfo info;
   memset(&info, 0, sizeof(info));
   info.desc = -1;
   return info;
 }
 
-// Converts a PP_FileHandle to a POSIX file descriptor.
-int32_t ConvertFileDescriptor(PP_FileHandle handle) {
-  PLUGIN_PRINTF(("ConvertFileDescriptor, handle=%d\n", handle));
-#if NACL_WINDOWS
-  int32_t file_desc = NACL_NO_FILE_DESC;
-  // On Windows, valid handles are 32 bit unsigned integers so this is safe.
-  file_desc = reinterpret_cast<uintptr_t>(handle);
-  // Convert the Windows HANDLE from Pepper to a POSIX file descriptor.
-  int32_t posix_desc = _open_osfhandle(file_desc, _O_RDWR | _O_BINARY);
-  if (posix_desc == -1) {
-    // Close the Windows HANDLE if it can't be converted.
-    CloseHandle(reinterpret_cast<HANDLE>(file_desc));
-    return -1;
-  }
-  return posix_desc;
-#else
-  return handle;
-#endif
-}
-
 }  // namespace
 
 namespace plugin {
 
 NaClFileInfoAutoCloser::NaClFileInfoAutoCloser()
     : info_(NoFileInfo()) {}
 
 NaClFileInfoAutoCloser::NaClFileInfoAutoCloser(NaClFileInfo* pass_ownership)
     : info_(*pass_ownership) {
   *pass_ownership = NoFileInfo();
@@ skipping 105 matching lines @@
   // invocation of the user callback. The user code will not be reentered.
   pp::CompletionCallback onload_callback =
       callback_factory_.NewCallback(&FileDownloader::URLLoadStartNotify);
   int32_t pp_error = url_loader_.Open(url_request, onload_callback);
   PLUGIN_PRINTF(("FileDownloader::Open (pp_error=%" NACL_PRId32 ")\n",
                  pp_error));
   CHECK(pp_error == PP_OK_COMPLETIONPENDING);
   return true;
 }
 
-void FileDownloader::OpenFast(const nacl::string& url,
-                              PP_FileHandle file_handle,
-                              uint64_t file_token_lo, uint64_t file_token_hi) {
-  PLUGIN_PRINTF(("FileDownloader::OpenFast (url=%s)\n", url.c_str()));
-
-  file_info_.FreeResources();
-  CHECK(instance_ != NULL);
-  status_code_ = NACL_HTTP_STATUS_OK;
-  url_ = url;
-  mode_ = DOWNLOAD_NONE;
-  if (file_handle != PP_kInvalidFileHandle) {
-    NaClFileInfo tmp_info = NoFileInfo();
-    tmp_info.desc = ConvertFileDescriptor(file_handle, true);
-    tmp_info.file_token.lo = file_token_lo;
-    tmp_info.file_token.hi = file_token_hi;
-    file_info_.TakeOwnership(&tmp_info);
-  }
-}
-
-NaClFileInfo FileDownloader::GetFileInfo() {
-  NaClFileInfo info_to_return = NoFileInfo();
-
-  PLUGIN_PRINTF(("FileDownloader::GetFileInfo, this %p\n", this));
-  if (file_info_.get_desc() != -1) {
-    info_to_return = file_info_.Release();
-  }
-  PLUGIN_PRINTF(("FileDownloader::GetFileInfo -- returning %d\n",
-                 info_to_return.desc));
-  return info_to_return;
-}
-
 bool FileDownloader::InitialResponseIsValid() {
   // Process the response, validating the headers to confirm successful loading.
   url_response_ = url_loader_.GetResponseInfo();
   if (url_response_.is_null()) {
     PLUGIN_PRINTF((
         "FileDownloader::InitialResponseIsValid (url_response_=NULL)\n"));
     return false;
   }
 
   pp::Var full_url = url_response_.GetURL();
@@ skipping 189 matching lines @@
   if (pp_error == PP_OK) {
     NaClFileInfo tmp_info = NoFileInfo();
     tmp_info.desc = ConvertFileDescriptor(handle, false);
     file_info_.TakeOwnership(&tmp_info);
   }
 
   stream_finish_callback_.RunAndClear(pp_error);
 }
 
 }  // namespace plugin