Pepper: Move LogToConsole to NexeLoadManager.

components/nacl/renderer/nexe_load_manager.cc

 // Copyright 2014 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/nexe_load_manager.h"
 
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "components/nacl/common/nacl_host_messages.h"
@@ skipping 79 matching lines @@
       nacl_ready_state_(PP_NACL_READY_STATE_UNSENT),
       nexe_error_reported_(false),
       plugin_instance_(content::PepperPluginInstance::Get(pp_instance)),
       weak_factory_(this) {
 }
 
 NexeLoadManager::~NexeLoadManager() {
 }
 
 void NexeLoadManager::ReportLoadError(PP_NaClError error,
-                                      const std::string& error_message) {
+                                      const std::string& error_message,
+                                      const std::string& console_message) {
   // Check that we are on the main renderer thread.
   DCHECK(content::RenderThread::Get());
 
   if (error == PP_NACL_ERROR_MANIFEST_PROGRAM_MISSING_ARCH) {
     // A special case: the manifest may otherwise be valid but is missing
     // a program/file compatible with the user's sandbox.
     IPC::Sender* sender = content::RenderThread::Get();
     sender->Send(
         new NaClHostMsg_MissingArchError(GetRoutingID(pp_instance_)));
   }
-  // TODO(dmichael): Move the following actions here:
-  // - Print error message to JavaScript console.
-
   set_nacl_ready_state(PP_NACL_READY_STATE_DONE);
   nexe_error_reported_ = true;
 
   // We must set all properties before calling DispatchEvent so that when an
   // event handler runs, the properties reflect the current load state.
   std::string error_string = std::string("NaCl module load failed: ") +
       std::string(error_message);
   plugin_instance_->SetEmbedProperty(
       ppapi::StringVar::StringToPPVar("lastError"),
       ppapi::StringVar::StringToPPVar(error_string));
@@ skipping 10 matching lines @@
       base::Bind(&NexeLoadManager::DispatchEvent,
                  weak_factory_.GetWeakPtr(),
                  ProgressEvent(PP_NACL_EVENT_LOADEND)));
 
   HistogramEnumerate("NaCl.LoadStatus.Plugin", error,
                      PP_NACL_ERROR_MAX);
   std::string uma_name = is_installed_ ?
                          "NaCl.LoadStatus.Plugin.InstalledApp" :
                          "NaCl.LoadStatus.Plugin.NotInstalledApp";
   HistogramEnumerate(uma_name, error, PP_NACL_ERROR_MAX);
+
+  LogToConsole(console_message);
 }
 
 void NexeLoadManager::DispatchEvent(const ProgressEvent &event) {
   blink::WebPluginContainer* container = plugin_instance_->GetContainer();
   // It's possible that container() is NULL if the plugin has been removed from
   // the DOM (but the PluginInstance is not destroyed yet).
   if (!container)
     return;
   blink::WebFrame* frame = container->element().document().frame();
   if (!frame)
@@ skipping 46 matching lines @@
 void NexeLoadManager::set_nacl_ready_state(PP_NaClReadyState ready_state) {
   nacl_ready_state_ = ready_state;
   SetReadOnlyProperty(ppapi::StringVar::StringToPPVar("readyState"),
                       PP_MakeInt32(ready_state));
 }
 
 void NexeLoadManager::SetReadOnlyProperty(PP_Var key, PP_Var value) {
   plugin_instance_->SetEmbedProperty(key, value);
 }
 
+void NexeLoadManager::LogToConsole(const std::string& message) {
+  ppapi::PpapiGlobals::Get()->LogWithSource(
+      pp_instance_, PP_LOGLEVEL_LOG, std::string("NativeClient"), message);
+}
+
 }  // namespace nacl