PPAPI: Move some of NexeFileDidOpen to NexeLoadManager

ppapi/native_client/src/trusted/plugin/plugin.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.
 
 #ifdef _MSC_VER
 // Do not warn about use of std::copy with raw pointers.
 #pragma warning(disable : 4996)
 #endif
 
 #include "ppapi/native_client/src/trusted/plugin/plugin.h"
@@ skipping 173 matching lines @@
       "NaCl.LoadStatus.SelLdr.InstalledApp" :
       "NaCl.LoadStatus.SelLdr.NotInstalledApp";
   HistogramEnumerate(name, error_code, NACL_ERROR_CODE_MAX,
                      LOAD_STATUS_UNKNOWN);
 }
 
 void Plugin::HistogramEnumerateManifestIsDataURI(bool is_data_uri) {
   HistogramEnumerate("NaCl.Manifest.IsDataURI", is_data_uri, 2, -1);
 }
 
-void Plugin::HistogramHTTPStatusCode(const std::string& name,
-                                     int status) {
+void Plugin::HistogramHTTPStatusCode(const std::string& name, int status) {
   // Log the status codes in rough buckets - 1XX, 2XX, etc.
   int sample = status / 100;
   // HTTP status codes only go up to 5XX, using "6" to indicate an internal
   // error.
   // Note: installed files may have "0" for a status code.
   if (status < 0 || status >= 600)
     sample = 6;
   HistogramEnumerate(name, sample, 7, 6);
 }
 
@@ skipping 401 matching lines @@
 void Plugin::HistogramStartupTimeMedium(const std::string& name, float dt) {
   int64_t nexe_size = nacl_interface_->GetNexeSize(pp_instance());
   if (nexe_size > 0) {
     float size_in_MB = static_cast<float>(nexe_size) / (1024.f * 1024.f);
     HistogramTimeMedium(name, static_cast<int64_t>(dt));
     HistogramTimeMedium(name + "PerMB", static_cast<int64_t>(dt / size_in_MB));
   }
 }
 
 void Plugin::NexeFileDidOpen(int32_t pp_error) {
-  PLUGIN_PRINTF(("Plugin::NexeFileDidOpen (pp_error=%" NACL_PRId32 ")\n",
-                 pp_error));
   NaClFileInfo tmp_info(nexe_downloader_.GetFileInfo());
   NaClFileInfoAutoCloser info(&tmp_info);
-  PLUGIN_PRINTF(("Plugin::NexeFileDidOpen (file_desc=%" NACL_PRId32 ")\n",
-                 info.get_desc()));
-  HistogramHTTPStatusCode(
-      nacl_interface_->GetIsInstalled(pp_instance()) ?
-          "NaCl.HttpStatusCodeClass.Nexe.InstalledApp" :
-          "NaCl.HttpStatusCodeClass.Nexe.NotInstalledApp",
-      nexe_downloader_.status_code());
-  ErrorInfo error_info;
-  if (pp_error != PP_OK || info.get_desc() == NACL_NO_FILE_DESC) {
-    if (pp_error == PP_ERROR_ABORTED) {
-      ReportLoadAbort();
-    } else if (pp_error == PP_ERROR_NOACCESS) {
-      error_info.SetReport(PP_NACL_ERROR_NEXE_NOACCESS_URL,
-                           "access to nexe url was denied.");
-      ReportLoadError(error_info);
-    } else {
-      error_info.SetReport(PP_NACL_ERROR_NEXE_LOAD_URL,
-                           "could not load nexe url.");
-      ReportLoadError(error_info);
-    }
-    return;
+
+  int64_t nexe_bytes_read = -1;
+  if (pp_error == PP_OK && info.get_desc() != NACL_NO_FILE_DESC) {
+    struct stat stat_buf;
+    if (0 == fstat(info.get_desc(), &stat_buf))
+      nexe_bytes_read = stat_buf.st_size;
   }
-  struct stat stat_buf;
-  if (0 != fstat(info.get_desc(), &stat_buf)) {
-    error_info.SetReport(PP_NACL_ERROR_NEXE_STAT, "could not stat nexe file.");
-    ReportLoadError(error_info);
-    return;
-  }
-  size_t nexe_bytes_read = static_cast<size_t>(stat_buf.st_size);
 
-  nacl_interface_->SetNexeSize(pp_instance(), nexe_bytes_read);
-  HistogramSizeKB("NaCl.Perf.Size.Nexe",
-                  static_cast<int32_t>(nexe_bytes_read / 1024));
+  nacl_interface_->NexeFileDidOpen(pp_instance(),
+                                   pp_error,
+                                   info.get_desc(),
+                                   nexe_downloader_.status_code(),
+                                   nexe_bytes_read,
+                                   nexe_downloader_.url().c_str());
   HistogramStartupTimeMedium(
       "NaCl.Perf.StartupTime.NexeDownload",
       static_cast<float>(nexe_downloader_.TimeSinceOpenMilliseconds()));
 
-  // Inform JavaScript that we successfully downloaded the nacl module.
-  EnqueueProgressEvent(PP_NACL_EVENT_PROGRESS,
-                       nexe_downloader_.url(),
-                       LENGTH_IS_COMPUTABLE,
-                       nexe_bytes_read,
-                       nexe_bytes_read);
-
   load_start_ = NaClGetTimeOfDayMicroseconds();
   nacl::scoped_ptr<nacl::DescWrapper>
       wrapper(wrapper_factory()->MakeFileDesc(info.Release().desc, O_RDONLY));
   NaClLog(4, "NexeFileDidOpen: invoking LoadNaClModule\n");
   LoadNaClModule(
       wrapper.release(),
       uses_nonsfi_mode_,
       true, /* enable_dyncode_syscalls */
       true, /* enable_exception_handling */
       false, /* enable_crash_throttling */
@@ skipping 551 matching lines @@
 
 void Plugin::SetExitStatusOnMainThread(int32_t pp_error,
                                        int exit_status) {
   DCHECK(pp::Module::Get()->core()->IsMainThread());
   DCHECK(nacl_interface_);
   nacl_interface_->SetExitStatus(pp_instance(), exit_status);
 }
 
 
 }  // namespace plugin