Revert of NaCl: Remove reliance on "init_done" SRPC call in the non-PNaCl case

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.
 
 #include "ppapi/native_client/src/trusted/plugin/plugin.h"
 
 #include <sys/stat.h>
 #include <sys/types.h>
 
 #include <string>
@@ skipping 291 matching lines @@
   return true;
 }
 
 void Plugin::NexeFileDidOpen(int32_t pp_error) {
   if (pp_error != PP_OK)
     return;
   LoadNaClModule(
       nexe_file_info_,
       uses_nonsfi_mode_,
       PP_NATIVE_NACL_PROCESS_TYPE,
-      // No-op callback.
-      pp::CompletionCallback());
+      callback_factory_.NewCallback(&Plugin::NexeFileDidOpenContinuation));
+}
+
+void Plugin::NexeFileDidOpenContinuation(int32_t pp_error) {
+  UNREFERENCED_PARAMETER(pp_error);
+  NaClLog(4, "Entered NexeFileDidOpenContinuation\n");
+  if (LoadNaClModuleContinuationIntern()) {
+    NaClLog(4, "NexeFileDidOpenContinuation: success;"
+            " setting histograms\n");
+    int64_t nexe_size = nacl_interface_->GetNexeSize(pp_instance());
+    nacl_interface_->ReportLoadSuccess(
+        pp_instance(), nexe_size, nexe_size);
+  } else {
+    NaClLog(4, "NexeFileDidOpenContinuation: failed.");
+  }
+  NaClLog(4, "Leaving NexeFileDidOpenContinuation\n");
 }
 
 void Plugin::BitcodeDidTranslate(int32_t pp_error) {
   PLUGIN_PRINTF(("Plugin::BitcodeDidTranslate (pp_error=%" NACL_PRId32 ")\n",
                  pp_error));
   if (pp_error != PP_OK) {
     // Error should have been reported by pnacl. Just return.
     return;
   }
 
   // Inform JavaScript that we successfully translated the bitcode to a nexe.
   PP_FileHandle handle = pnacl_coordinator_->TakeTranslatedFileHandle();
 
   PP_NaClFileInfo info;
   info.handle = handle;
   info.token_lo = 0;
   info.token_hi = 0;
   LoadNaClModule(
       info,
       false, /* uses_nonsfi_mode */
       PP_PNACL_PROCESS_TYPE,
       callback_factory_.NewCallback(&Plugin::BitcodeDidTranslateContinuation));
 }
 
-// This is the only code path that responds to the
-// "init_done"/StartupInitializationComplete() SRPC call, which now has an
-// effect for PNaCl only.
-// TODO(mseaborn): Switch to doing this ReportLoadSuccess() call via the
-// Chrome-IPC-based StartupInitializationComplete() handler in
-// ppb_nacl_private_impl.cc, to match the non-PNaCl cases.
 void Plugin::BitcodeDidTranslateContinuation(int32_t pp_error) {
   NaClLog(4, "Entered BitcodeDidTranslateContinuation\n");
   UNREFERENCED_PARAMETER(pp_error);
   if (LoadNaClModuleContinuationIntern()) {
     int64_t loaded;
     int64_t total;
     // TODO(teravest): Tighten this up so we can get rid of
     // GetCurrentProgress(). loaded should always equal total.
     pnacl_coordinator_->GetCurrentProgress(&loaded, &total);
     nacl_interface_->ReportLoadSuccess(pp_instance(), loaded, total);
@@ skipping 38 matching lines @@
   }
 }
 
 void Plugin::ReportLoadError(const ErrorInfo& error_info) {
   nacl_interface_->ReportLoadError(pp_instance(),
                                    error_info.error_code(),
                                    error_info.message().c_str());
 }
 
 }  // namespace plugin