| Index: third_party/libjingle/overrides/initialize_module.cc
|
| diff --git a/third_party/libjingle/overrides/initialize_module.cc b/third_party/libjingle/overrides/initialize_module.cc
|
| index fd1af1196bb9028504fba0ffe5b3bc6f1b212dee..c81003ec2ed756500d541cf94b58cf554d4c768c 100644
|
| --- a/third_party/libjingle/overrides/initialize_module.cc
|
| +++ b/third_party/libjingle/overrides/initialize_module.cc
|
| @@ -44,18 +44,19 @@ extern "C" {
|
| // return pointers to libjingle's WebRTC factory methods.
|
| // Called from init_webrtc.cc.
|
| ALLOC_EXPORT
|
| -bool InitializeModule(const CommandLine& command_line,
|
| +bool InitializeModule(
|
| + const CommandLine& command_line,
|
| #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
| - AllocateFunction alloc,
|
| - DellocateFunction dealloc,
|
| + AllocateFunction alloc,
|
| + DellocateFunction dealloc,
|
| #endif
|
| - logging::LogMessageHandlerFunction log_handler,
|
| - webrtc::GetCategoryEnabledPtr trace_get_category_enabled,
|
| - webrtc::AddTraceEventPtr trace_add_trace_event,
|
| - CreateWebRtcMediaEngineFunction* create_media_engine,
|
| - DestroyWebRtcMediaEngineFunction* destroy_media_engine,
|
| - InitDiagnosticLoggingDelegateFunctionFunction*
|
| - init_diagnostic_logging) {
|
| + logging::LogMessageHandlerFunction log_handler,
|
| + webrtc::GetCategoryEnabledPtr trace_get_category_enabled,
|
| + webrtc::AddTraceEventPtr trace_add_trace_event,
|
| + webrtc::field_trial::FindFullNameMethod field_trial_find,
|
| + CreateWebRtcMediaEngineFunction* create_media_engine,
|
| + DestroyWebRtcMediaEngineFunction* destroy_media_engine,
|
| + InitDiagnosticLoggingDelegateFunctionFunction* init_diagnostic_logging) {
|
| #if !defined(OS_MACOSX) && !defined(OS_ANDROID)
|
| g_alloc = alloc;
|
| g_dealloc = dealloc;
|
| @@ -79,6 +80,7 @@ bool InitializeModule(const CommandLine& command_line,
|
| logging::SetLogMessageHandler(log_handler);
|
| webrtc::SetupEventTracer(trace_get_category_enabled,
|
| trace_add_trace_event);
|
| + webrtc::field_trial::Init(field_trial_find);
|
| }
|
|
|
| return true;
|
|
|