Pepper: Miscellaneous trusted plugin cleanup.

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 556 matching lines @@
         ErrorInfo error_info;
         error_info.SetReport(PP_NACL_ERROR_SEL_LDR_START_MODULE,
                              "ServiceRuntime: could not start nacl module");
         plugin_->ReportLoadError(error_info);
       }
       return false;
     }
   }
 
   NaClLog(4, "ServiceRuntime::StartModule (load_status=%d)\n", load_status);
-  if (main_service_runtime_)
-    plugin_->ReportSelLdrLoadStatus(load_status);
+  if (main_service_runtime_) {
+    if (load_status < 0 || load_status > NACL_ERROR_CODE_MAX)
+      load_status = LOAD_STATUS_UNKNOWN;
+    GetNaClInterface()->ReportSelLdrStatus(plugin_->pp_instance(),
+                                           load_status,
+                                           NACL_ERROR_CODE_MAX);
+  }
 
   if (LOAD_OK != load_status) {
     if (main_service_runtime_) {
       ErrorInfo error_info;
       error_info.SetReport(
           PP_NACL_ERROR_SEL_LDR_START_STATUS,
           NaClErrorString(static_cast<NaClErrorCode>(load_status)));
       plugin_->ReportLoadError(error_info);
     }
     return false;
@@ skipping 183 matching lines @@
 
 nacl::string ServiceRuntime::GetCrashLogOutput() {
   if (NULL != subprocess_.get()) {
     return subprocess_->GetCrashLogOutput();
   } else {
     return std::string();
   }
 }
 
 }  // namespace plugin