| Index: chrome/browser/ui/browser_ui_prefs.cc
|
| diff --git a/chrome/browser/ui/browser_ui_prefs.cc b/chrome/browser/ui/browser_ui_prefs.cc
|
| index 1b25184cc7243293041b90bb108422d1a8d4a53f..6fef9f7457c4cf90ce08fa76245f8fc977818a90 100644
|
| --- a/chrome/browser/ui/browser_ui_prefs.cc
|
| +++ b/chrome/browser/ui/browser_ui_prefs.cc
|
| @@ -12,6 +12,7 @@
|
| #include "chrome/common/pref_names.h"
|
| #include "components/pref_registry/pref_registry_syncable.h"
|
| #include "components/translate/core/common/translate_pref_names.h"
|
| +#include "content/public/common/webrtc_ip_handling_policy.h"
|
|
|
| namespace chrome {
|
|
|
| @@ -102,8 +103,11 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
|
| false,
|
| user_prefs::PrefRegistrySyncable::SYNCABLE_PREF);
|
| #if defined(ENABLE_WEBRTC)
|
| + // TODO(guoweis): Remove next 2 options at M50.
|
| registry->RegisterBooleanPref(prefs::kWebRTCMultipleRoutesEnabled, true);
|
| registry->RegisterBooleanPref(prefs::kWebRTCNonProxiedUdpEnabled, true);
|
| + registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy,
|
| + content::kWebRTCIPHandlingDefault);
|
| #endif
|
|
|
| // Dictionaries to keep track of default tasks in the file browser.
|
|
|