Pepper: Nexe downloading out of the trusted plugin.

components/nacl/renderer/nexe_load_manager.cc

 // Copyright 2014 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 "components/nacl/renderer/nexe_load_manager.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/strings/string_tokenizer.h"
@@ skipping 89 matching lines @@
 }
 
 NexeLoadManager::~NexeLoadManager() {
   if (!nexe_error_reported_) {
     base::TimeDelta uptime = base::Time::Now() - ready_time_;
     HistogramTimeLarge("NaCl.ModuleUptime.Normal", uptime.InMilliseconds());
   }
 }
 
 void NexeLoadManager::NexeFileDidOpen(int32_t pp_error,
-                                      int32_t fd,
+                                      base::PlatformFile file,
                                       int32_t http_status,
                                       int64_t nexe_bytes_read,
                                       const std::string& url,
-                                      int64_t time_since_open) {
+                                      base::TimeDelta time_since_open) {
   // Check that we are on the main renderer thread.
   DCHECK(content::RenderThread::Get());
   VLOG(1) << "Plugin::NexeFileDidOpen (pp_error=" << pp_error << ")";
-  VLOG(1) << "Plugin::NexeFileDidOpen (file_desc=" << fd << ")";
   HistogramHTTPStatusCode(
       is_installed_ ? "NaCl.HttpStatusCodeClass.Nexe.InstalledApp" :
                       "NaCl.HttpStatusCodeClass.Nexe.NotInstalledApp",
       http_status);
-  // TODO(dmichael): fd is only used for error reporting here currently, and
-  // the trusted Plugin is responsible for using it and closing it.
-  // Note -1 is NACL_NO_FILE_DESC from nacl_macros.h.
-  if (pp_error != PP_OK || fd == -1) {
+
+  if (pp_error != PP_OK || file == base::kInvalidPlatformFileValue) {
     if (pp_error == PP_ERROR_ABORTED) {
       ReportLoadAbort();
     } else if (pp_error == PP_ERROR_NOACCESS) {
       ReportLoadError(PP_NACL_ERROR_NEXE_NOACCESS_URL,
                       "access to nexe url was denied.");
     } else {
       ReportLoadError(PP_NACL_ERROR_NEXE_LOAD_URL,
                       "could not load nexe url.");
     }
   } else if (nexe_bytes_read == -1) {
     ReportLoadError(PP_NACL_ERROR_NEXE_STAT, "could not stat nexe file.");
   } else {
     // TODO(dmichael): Can we avoid stashing away so much state?
     nexe_size_ = nexe_bytes_read;
     HistogramSizeKB("NaCl.Perf.Size.Nexe",
                     static_cast<int32_t>(nexe_size_ / 1024));
     HistogramStartupTimeMedium(
-        "NaCl.Perf.StartupTime.NexeDownload",
-        base::TimeDelta::FromMilliseconds(time_since_open),
-        nexe_size_);
+        "NaCl.Perf.StartupTime.NexeDownload", time_since_open, nexe_size_);
 
     // Inform JavaScript that we successfully downloaded the nacl module.
     ProgressEvent progress_event(PP_NACL_EVENT_PROGRESS, url, true, nexe_size_,
                                  nexe_size_);
     DispatchProgressEvent(pp_instance_, progress_event);
     load_start_ = base::Time::Now();
   }
 }
 
 void NexeLoadManager::ReportLoadSuccess(const std::string& url,
@@ skipping 267 matching lines @@
   // to provide error handling.
 }
 
 void NexeLoadManager::CopyCrashLogToJsConsole(const std::string& crash_log) {
   base::StringTokenizer t(crash_log, "\n");
   while (t.GetNext())
     LogToConsole(t.token());
 }
 
 }  // namespace nacl