Index: third_party/libjingle/overrides/init_webrtc.cc |
diff --git a/third_party/libjingle/overrides/init_webrtc.cc b/third_party/libjingle/overrides/init_webrtc.cc |
index 746f8831cd10fca3713c4caf013c1d4a38678e4e..9fffb894a4bd03f90fc02f3dcb31eadbedd5f7c1 100644 |
--- a/third_party/libjingle/overrides/init_webrtc.cc |
+++ b/third_party/libjingle/overrides/init_webrtc.cc |
@@ -10,6 +10,7 @@ |
#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); |
@@ -95,13 +96,19 @@ bool InitializeWebRtcModule() { |
// 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( |