Pepper: Move Pnacl init time out of trusted plugin.

components/nacl/renderer/ppb_nacl_private_impl.cc

 // Copyright 2013 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/ppb_nacl_private_impl.h"
 
 #include <numeric>
 #include <string>
 #include <vector>
 
@@ skipping 641 matching lines @@
       handle,
       enter.callback());
 
   return enter.SetResult(PP_OK_COMPLETIONPENDING);
 }
 
 void ReportTranslationFinished(PP_Instance instance,
                                PP_Bool success,
                                int32_t opt_level,
                                int64_t pexe_size,
-                               int64_t compile_time_us,
-                               int64_t total_time_us) {
+                               int64_t compile_time_us) {
   if (success == PP_TRUE) {
     static const int32_t kUnknownOptLevel = 4;
     if (opt_level < 0 || opt_level > 3)
       opt_level = kUnknownOptLevel;
     HistogramEnumerate("NaCl.Options.PNaCl.OptLevel",
                        opt_level,
                        kUnknownOptLevel + 1);
     HistogramKBPerSec("NaCl.Perf.PNaClLoadTime.CompileKBPerSec",
                       pexe_size / 1024,
                       compile_time_us);
     HistogramSizeKB("NaCl.Perf.Size.Pexe", pexe_size / 1024);
 
-    HistogramTimeTranslation("NaCl.Perf.PNaClLoadTime.TotalUncachedTime",
-                             total_time_us / 1000);
-    HistogramKBPerSec("NaCl.Perf.PNaClLoadTime.TotalUncachedKBPerSec",
-                      pexe_size / 1024,
-                      total_time_us);
+    NexeLoadManager* load_manager = GetNexeLoadManager(instance);
+    if (load_manager) {
+      base::TimeDelta total_time = base::Time::Now() -
+                                   load_manager->pnacl_start_time();
+      HistogramTimeTranslation("NaCl.Perf.PNaClLoadTime.TotalUncachedTime",
+                               total_time.InMilliseconds());
+      HistogramKBPerSec("NaCl.Perf.PNaClLoadTime.TotalUncachedKBPerSec",
+                        pexe_size / 1024,
+                        total_time.InMicroseconds());
+    }
   }
 
   // If the resource host isn't initialized, don't try to do that here.
   // Just return because something is already very wrong.
   if (g_pnacl_resource_host.Get() == NULL)
     return;
   g_pnacl_resource_host.Get()->ReportTranslationFinished(instance, success);
 }
 
 PP_FileHandle OpenNaClExecutable(PP_Instance instance,
@@ skipping 887 matching lines @@
                           &pnacl_options)) {
     PostPPCompletionCallback(callback, PP_ERROR_FAILED);
   }
 
   // TODO(teravest): Make a type like PP_NaClFileInfo to use for DownloadFile
   // that would close the file handle on destruction.
   DownloadFile(instance, url,
                base::Bind(&DidOpenManifestEntry, out_file_info, callback));
 }
 
+void SetPNaClStartTime(PP_Instance instance) {
+  NexeLoadManager* load_manager = GetNexeLoadManager(instance);
+  if (load_manager)
+    load_manager->set_pnacl_start_time(base::Time::Now());
+}
+
 const PPB_NaCl_Private nacl_interface = {
   &LaunchSelLdr,
   &StartPpapiProxy,
   &UrandomFD,
   &Are3DInterfacesDisabled,
   &BrokerDuplicateHandle,
   &GetReadonlyPnaclFd,
   &CreateTemporaryFile,
   &GetNumberOfProcessors,
   &PPIsNonSFIModeEnabled,
@@ skipping 19 matching lines @@
   &GetManifestBaseURL,
   &ProcessNaClManifest,
   &DevInterfacesEnabled,
   &ManifestGetProgramURL,
   &GetPNaClResourceInfo,
   &GetCpuFeatureAttrs,
   &PostMessageToJavaScript,
   &DownloadNexe,
   &ReportSelLdrStatus,
   &LogTranslateTime,
-  &OpenManifestEntry
+  &OpenManifestEntry,
+  &SetPNaClStartTime
 };
 
 }  // namespace
 
 const PPB_NaCl_Private* GetNaClPrivateInterface() {
   return &nacl_interface;
 }
 
 }  // namespace nacl