diff options
| author | grunell@chromium.org <grunell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 12:05:52 +0000 |
|---|---|---|
| committer | grunell@chromium.org <grunell@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-11-14 12:05:52 +0000 |
| commit | d9d7cc71511ff53b0a81887460784151938c87ac (patch) | |
| tree | 7f0f5101da6a0b21646850d8cc0649203cb04107 /third_party/libjingle/overrides/init_webrtc.cc | |
| parent | 724d9e77f93681b6c4d24e4c5cc0c5ac698c6641 (diff) | |
| download | chromium_src-d9d7cc71511ff53b0a81887460784151938c87ac.zip chromium_src-d9d7cc71511ff53b0a81887460784151938c87ac.tar.gz chromium_src-d9d7cc71511ff53b0a81887460784151938c87ac.tar.bz2 | |
Fix WebRTC logging so that logs from libpeerconnection make it to the log.
BUG=319166
Review URL: https://codereview.chromium.org/71353010
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@235123 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'third_party/libjingle/overrides/init_webrtc.cc')
| -rw-r--r-- | third_party/libjingle/overrides/init_webrtc.cc | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/third_party/libjingle/overrides/init_webrtc.cc b/third_party/libjingle/overrides/init_webrtc.cc index 746f883..e0e0532 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 = NULL; + 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( |