Pepper: Move LogToConsole to NexeLoadManager.

components/nacl/renderer/ppb_nacl_private_impl.cc

 // Copyright 2013 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/ppb_nacl_private_impl.h"
 
 #include "base/command_line.h"
 #include "base/containers/scoped_ptr_hash_map.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
@@ skipping 17 matching lines @@
 #include "ppapi/c/private/pp_file_handle.h"
 #include "ppapi/native_client/src/trusted/plugin/nacl_entry_points.h"
 #include "ppapi/shared_impl/ppapi_globals.h"
 #include "ppapi/shared_impl/ppapi_permissions.h"
 #include "ppapi/shared_impl/ppapi_preferences.h"
 #include "ppapi/shared_impl/var.h"
 #include "ppapi/thunk/enter.h"
 
 namespace {
 
-// Forward declare LogToConsole() we can use it in other functions here.
-void LogToConsole(PP_Instance instance, const char* message);
-
 base::LazyInstance<scoped_refptr<PnaclTranslationResourceHost> >
     g_pnacl_resource_host = LAZY_INSTANCE_INITIALIZER;
 
 static bool InitializePnaclResourceHost() {
   // Must run on the main thread.
   content::RenderThread* render_thread = content::RenderThread::Get();
   if (!render_thread)
     return false;
   if (!g_pnacl_resource_host.Get()) {
     g_pnacl_resource_host.Get() = new PnaclTranslationResourceHost(
@@ skipping 391 matching lines @@
   if (load_manager)
     load_manager->SetReadOnlyProperty(key, value);
 }
 
 void ReportLoadError(PP_Instance instance,
                      PP_NaClError error,
                      const char* error_message,
                      const char* console_message) {
   nacl::NexeLoadManager* load_manager = GetNexeLoadManager(instance);
   if (load_manager)
-    load_manager->ReportLoadError(error, error_message);
-  LogToConsole(instance, console_message);
+    load_manager->ReportLoadError(error, error_message, console_message);
 }
 
 void InstanceCreated(PP_Instance instance) {
   scoped_ptr<nacl::NexeLoadManager> new_load_manager(
       new nacl::NexeLoadManager(instance));
   NexeLoadManagerMap& map = g_load_manager_map.Get();
   DLOG_IF(ERROR, map.count(instance) != 0) << "Instance count should be 0";
   map.add(instance, new_load_manager.Pass());
 }
 
@@ skipping 19 matching lines @@
 
   GURL gurl(url_string->value());
   if (gurl.SchemeIs("chrome-extension"))
     return PP_SCHEME_CHROME_EXTENSION;
   if (gurl.SchemeIs("data"))
     return PP_SCHEME_DATA;
   return PP_SCHEME_OTHER;
 }
 
 void LogToConsole(PP_Instance instance, const char* message) {
-  std::string source("NativeClient");
-  ppapi::PpapiGlobals::Get()->LogWithSource(instance,
-                                            PP_LOGLEVEL_LOG,
-                                            source,
-                                            std::string(message));
+  nacl::NexeLoadManager* load_manager = GetNexeLoadManager(instance);
+  DCHECK(load_manager);
+  if (load_manager)
+    load_manager->LogToConsole(std::string(message));
 }
 
 PP_Bool GetNexeErrorReported(PP_Instance instance) {
   nacl::NexeLoadManager* load_manager = GetNexeLoadManager(instance);
   DCHECK(load_manager);
   if (load_manager)
     return PP_FromBool(load_manager->nexe_error_reported());
   return PP_FALSE;
 }
 
@@ skipping 66 matching lines @@
 
 }  // namespace
 
 namespace nacl {
 
 const PPB_NaCl_Private* GetNaClPrivateInterface() {
   return &nacl_interface;
 }
 
 }  // namespace nacl