Pepper: Simplify LaunchSelLdr error reporting.

components/nacl/renderer/ppb_nacl_private_impl.cc

Index: components/nacl/renderer/ppb_nacl_private_impl.cc
diff --git a/components/nacl/renderer/ppb_nacl_private_impl.cc b/components/nacl/renderer/ppb_nacl_private_impl.cc
index e9efc6b5ba027b6b132b23d65b92f1f91ab04409..9c8559e7a18552a0a46f7d2ceff80d28c3c8acd9 100644
--- a/components/nacl/renderer/ppb_nacl_private_impl.cc
+++ b/components/nacl/renderer/ppb_nacl_private_impl.cc
@@ -252,6 +252,7 @@ class ManifestServiceProxy : public ManifestServiceChannel::Delegate {
 
 // Launch NaCl's sel_ldr process.
 void LaunchSelLdr(PP_Instance instance,
+                  PP_Bool main_service_runtime,
                   const char* alleged_url,
                   PP_Bool uses_irt,
                   PP_Bool uses_ppapi,
@@ -263,7 +264,6 @@ void LaunchSelLdr(PP_Instance instance,
                   const PPP_ManifestService* manifest_service_interface,
                   void* manifest_service_user_data,
                   void* imc_handle,
-                  struct PP_Var* error_message,
                   PP_CompletionCallback callback) {
   CHECK(ppapi::PpapiGlobals::Get()->GetMainThreadMessageLoop()->
             BelongsToCurrentThread());
@@ -279,7 +279,6 @@ void LaunchSelLdr(PP_Instance instance,
   FileDescriptor result_socket;
   IPC::Sender* sender = content::RenderThread::Get();
   DCHECK(sender);
-  *error_message = PP_MakeUndefined();
   int routing_id = 0;
   // If the nexe uses ppapi APIs, we need a routing ID.
   // To get the routing ID, we must be on the main thread.
@@ -328,7 +327,13 @@ void LaunchSelLdr(PP_Instance instance,
     return;
   }
   if (!error_message_string.empty()) {
-    *error_message = ppapi::StringVar::StringToPPVar(error_message_string);
+    if (PP_ToBool(main_service_runtime)) {
+      NexeLoadManager* load_manager = GetNexeLoadManager(instance);
+      if (load_manager)

[bbudge, 2014/05/12 20:50:15]

brackets?

+        load_manager->ReportLoadError(PP_NACL_ERROR_SEL_LDR_LAUNCH,
+                                      "ServiceRuntime: failed to start",
+                                      error_message_string);
+    }
     ppapi::PpapiGlobals::Get()->GetMainThreadMessageLoop()->PostTask(
         FROM_HERE,
         base::Bind(callback.func, callback.user_data,