Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(16)

Unified Diff: third_party/libjingle/overrides/initialize_module.cc

Issue 272503004: Wire up chrome field trials with webrtc. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Update to use webrtc::field_trial namespace. Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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;

Powered by Google App Engine
This is Rietveld 408576698