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

Unified Diff: third_party/libjingle/overrides/init_webrtc.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/init_webrtc.cc
diff --git a/third_party/libjingle/overrides/init_webrtc.cc b/third_party/libjingle/overrides/init_webrtc.cc
index eda9858f8c9b166bada6f4f95f94fbb2408457b3..7764e1429fe7e6aa8819325879cbce2a38dafe83 100644
--- a/third_party/libjingle/overrides/init_webrtc.cc
+++ b/third_party/libjingle/overrides/init_webrtc.cc
@@ -8,6 +8,7 @@
#include "base/debug/trace_event.h"
#include "base/file_util.h"
#include "base/files/file_path.h"
+#include "base/metrics/field_trial.h"
#include "base/native_library.h"
#include "base/path_service.h"
#include "talk/base/basictypes.h"
@@ -39,6 +40,7 @@ void AddTraceEvent(char phase,
// have to be in other places.
bool InitializeWebRtcModule() {
webrtc::SetupEventTracer(&GetCategoryGroupEnabled, &AddTraceEvent);
+ webrtc::field_trial::Init(&base::FieldTrialList::FindFullName);
return true;
}
@@ -115,12 +117,16 @@ bool InitializeWebRtcModule() {
InitDiagnosticLoggingDelegateFunctionFunction init_diagnostic_logging = NULL;
bool init_ok = initialize_module(*CommandLine::ForCurrentProcess(),
#if !defined(OS_MACOSX) && !defined(OS_ANDROID)
- &Allocate, &Dellocate,
+ &Allocate,
+ &Dellocate,
#endif
- logging::GetLogMessageHandler(),
- &GetCategoryGroupEnabled, &AddTraceEvent,
- &g_create_webrtc_media_engine, &g_destroy_webrtc_media_engine,
- &init_diagnostic_logging);
+ logging::GetLogMessageHandler(),
+ &GetCategoryGroupEnabled,
+ &AddTraceEvent,
+ &base::FieldTrialList::FindFullName,
+ &g_create_webrtc_media_engine,
+ &g_destroy_webrtc_media_engine,
+ &init_diagnostic_logging);
if (init_ok)
talk_base::SetExtraLoggingInit(init_diagnostic_logging);

Powered by Google App Engine
This is Rietveld 408576698