Fix WebRTC logging so that logs from libpeerconnection make it to the log.

third_party/libjingle/overrides/init_webrtc.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 "init_webrtc.h"
 
 #include "base/command_line.h"
 #include "base/debug/trace_event.h"
 #include "base/files/file_path.h"
 #include "base/native_library.h"
 #include "base/path_service.h"
 #include "talk/base/basictypes.h"
+#include "third_party/libjingle/overrides/talk/base/logging.h"
 
 const unsigned char* GetCategoryGroupEnabled(const char* category_group) {
   return TRACE_EVENT_API_GET_CATEGORY_GROUP_ENABLED(category_group);
 }
 
 void AddTraceEvent(char phase,
                    const unsigned char* category_group_enabled,
                    const char* name,
                    unsigned long long id,
                    int num_args,
@@ skipping 65 matching lines @@
       reinterpret_cast<InitializeModuleFunction>(
           base::GetFunctionPointerFromNativeLibrary(
               lib, "InitializeModule"));
 
   // Initialize the proxy by supplying it with a pointer to our
   // allocator/deallocator routines.
   // On mac we use malloc zones, which are global, so we provide NULLs for
   // the alloc/dealloc functions.
   // PS: This function is actually implemented in allocator_proxy.cc with the
   // new/delete overrides.
-  return initialize_module(*CommandLine::ForCurrentProcess(),
+  InitDiagnosticLoggingDelegateFunctionFunction init_diagnostic_logging;

[Jói, 2013/11/13 20:40:13]

nit: Would set this to NULL.

[tommi (sloooow) - chröme, 2013/11/14 08:12:18]

+1

[Henrik Grunell, 2013/11/14 09:04:08]

Done.

+  bool init_ok = initialize_module(*CommandLine::ForCurrentProcess(),
 #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
       &Allocate, &Dellocate,
 #endif
       logging::GetLogMessageHandler(),
       &GetCategoryGroupEnabled, &AddTraceEvent,
-      &g_create_webrtc_media_engine, &g_destroy_webrtc_media_engine);
+      &g_create_webrtc_media_engine, &g_destroy_webrtc_media_engine,
+      &init_diagnostic_logging);
+
+  if (init_ok)
+    talk_base::SetExtraLoggingInit(init_diagnostic_logging);
+  return init_ok;
 }
 
 cricket::MediaEngineInterface* CreateWebRtcMediaEngine(
     webrtc::AudioDeviceModule* adm,
     webrtc::AudioDeviceModule* adm_sc,
     cricket::WebRtcVideoEncoderFactory* encoder_factory,
     cricket::WebRtcVideoDecoderFactory* decoder_factory) {
   // For convenience of tests etc, we call InitializeWebRtcModule here.
   // For Chrome however, InitializeWebRtcModule must be called
   // explicitly before the sandbox is initialized.  In that case, this call is
   // effectively a noop.
   InitializeWebRtcModule();
   return g_create_webrtc_media_engine(adm, adm_sc, encoder_factory,
       decoder_factory);
 }
 
 void DestroyWebRtcMediaEngine(cricket::MediaEngineInterface* media_engine) {
   g_destroy_webrtc_media_engine(media_engine);
 }
 
 #endif  // LIBPEERCONNECTION_LIB