Pepper: Simplify LaunchSelLdr error reporting.

ppapi/native_client/src/trusted/plugin/service_runtime.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.
  */
 
 #define NACL_LOG_MODULE_NAME "Plugin_ServiceRuntime"
 
 #include "ppapi/native_client/src/trusted/plugin/service_runtime.h"
 
@@ skipping 632 matching lines @@
     if (main_service_runtime_) {
       ErrorInfo error_info;
       error_info.SetReport(
           PP_NACL_ERROR_SEL_LDR_CREATE_LAUNCHER,
           "ServiceRuntime: failed to create sel_ldr launcher");
       plugin_->ReportLoadError(error_info);
     }
     pp::Module::Get()->core()->CallOnMainThread(0, callback, PP_ERROR_FAILED);
     return;
   }
-  pp::CompletionCallback internal_callback =
-      callback_factory_.NewCallback(&ServiceRuntime::StartSelLdrContinuation,
-                                    callback);
 
   ManifestService* manifest_service =
       new ManifestService(anchor_->Ref(), rev_interface_);
   tmp_subprocess->Start(plugin_->pp_instance(),
+                        main_service_runtime_,
                         params.url.c_str(),
                         params.uses_irt,
                         params.uses_ppapi,
                         params.uses_nonsfi_mode,
                         params.enable_dev_interfaces,
                         params.enable_dyncode_syscalls,
                         params.enable_exception_handling,
                         params.enable_crash_throttling,
                         &kManifestServiceVTable,
                         manifest_service,
-                        &start_sel_ldr_error_message_,
-                        internal_callback);
+                        callback);
   subprocess_.reset(tmp_subprocess.release());
 }
 
-void ServiceRuntime::StartSelLdrContinuation(int32_t pp_error,
-                                             pp::CompletionCallback callback) {
-  if (pp_error != PP_OK) {
-    NaClLog(LOG_ERROR, "ServiceRuntime::StartSelLdrContinuation "
-                       " (start failed)\n");
-    if (main_service_runtime_) {
-      std::string error_message;
-      pp::Var var_error_message_cpp(pp::PASS_REF, start_sel_ldr_error_message_);
-      if (var_error_message_cpp.is_string()) {
-        error_message = var_error_message_cpp.AsString();
-      }
-      ErrorInfo error_info;
-      error_info.SetReportWithConsoleOnlyError(
-          PP_NACL_ERROR_SEL_LDR_LAUNCH,
-          "ServiceRuntime: failed to start",
-          error_message);
-      plugin_->ReportLoadError(error_info);
-    }
-  }
-  pp::Module::Get()->core()->CallOnMainThread(0, callback, pp_error);
-}
-
 bool ServiceRuntime::WaitForSelLdrStart() {
   // Time to wait on condvar (for browser to create a new sel_ldr process on
   // our behalf). Use 6 seconds to be *fairly* conservative.
   //
   // On surfaway, the CallOnMainThread above may never get scheduled
   // to unblock this condvar, or the IPC reply from the browser to renderer
   // might get canceled/dropped. However, it is currently important to
   // avoid waiting indefinitely because ~PnaclCoordinator will attempt to
   // join() the PnaclTranslateThread, and the PnaclTranslateThread is waiting
   // for the signal before exiting.
@@ skipping 134 matching lines @@
 
 nacl::string ServiceRuntime::GetCrashLogOutput() {
   if (NULL != subprocess_.get()) {
     return subprocess_->GetCrashLogOutput();
   } else {
     return std::string();
   }
 }
 
 }  // namespace plugin