Remove obsolete webrtc.nonproxied_udp_enabled pref

Bug: 982501
Change-Id: I5b25e2b8ce3d7e86527cbb59f9bce3d7e1a24dbc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2498562
Commit-Queue: Tony Price <toprice@chromium.org>
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Avi Drissman <avi@chromium.org>
Reviewed-by: Devlin <rdevlin.cronin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#824373}

chrome/browser/extensions/api/preference/preference_api.cc

@@ -129,8 +129,6 @@ const PrefMappingEntry kPrefMapping[] = {
      APIPermission::kPrivacy, APIPermission::kPrivacy},
     {"translationServiceEnabled", prefs::kOfferTranslateEnabled,
      APIPermission::kPrivacy, APIPermission::kPrivacy},
-    {"webRTCNonProxiedUdpEnabled", prefs::kWebRTCNonProxiedUdpEnabled,
-     APIPermission::kPrivacy, APIPermission::kPrivacy},
     {"webRTCIPHandlingPolicy", prefs::kWebRTCIPHandlingPolicy,
      APIPermission::kPrivacy, APIPermission::kPrivacy},
     {"webRTCUDPPortRange", prefs::kWebRTCUDPPortRange, APIPermission::kPrivacy,

chrome/browser/extensions/api/preference/preference_apitest.cc

@@ -165,7 +165,6 @@ IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, Standard) {
   prefs->SetBoolean(password_manager::prefs::kCredentialsEnableService, false);
   prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false);
   prefs->SetBoolean(prefs::kSearchSuggestEnabled, false);
-  prefs->SetBoolean(prefs::kWebRTCNonProxiedUdpEnabled, false);
   prefs->SetString(prefs::kWebRTCIPHandlingPolicy,
                    blink::kWebRTCIPHandlingDefaultPublicInterfaceOnly);
 

chrome/browser/renderer_preferences_util.cc

@@ -118,13 +118,6 @@ void UpdateFromSystemSettings(blink::RendererPreferences* prefs,
       prefs->caret_browsing_enabled);
 #endif
 
-  // Handling the backward compatibility of previous boolean versions of policy
-  // controls.
-  if (!pref_service->HasPrefPath(prefs::kWebRTCIPHandlingPolicy) &&
-      !pref_service->GetBoolean(prefs::kWebRTCNonProxiedUdpEnabled)) {
-    prefs->webrtc_ip_handling_policy =
-        blink::kWebRTCIPHandlingDisableNonProxiedUdp;
-  }
   if (prefs->webrtc_ip_handling_policy.empty()) {
     prefs->webrtc_ip_handling_policy =
         pref_service->GetString(prefs::kWebRTCIPHandlingPolicy);

chrome/browser/ui/browser_ui_prefs.cc

@@ -86,8 +86,6 @@ void RegisterBrowserUserPrefs(user_prefs::PrefRegistrySyncable* registry) {
   registry->RegisterBooleanPref(prefs::kPrintPreviewUseSystemDefaultPrinter,
                                 false);
 #endif
-  // TODO(guoweis): Remove next option at M50.
-  registry->RegisterBooleanPref(prefs::kWebRTCNonProxiedUdpEnabled, true);
   registry->RegisterStringPref(prefs::kWebRTCIPHandlingPolicy,
                                blink::kWebRTCIPHandlingDefault);
   registry->RegisterStringPref(prefs::kWebRTCUDPPortRange, std::string());

chrome/browser/ui/prefs/pref_watcher.cc

@@ -82,8 +82,6 @@ PrefWatcher::PrefWatcher(Profile* profile) : profile_(profile) {
                                      renderer_callback);
   profile_pref_change_registrar_.Add(prefs::kEnableEncryptedMedia,
                                      renderer_callback);
-  profile_pref_change_registrar_.Add(prefs::kWebRTCNonProxiedUdpEnabled,
-                                     renderer_callback);
   profile_pref_change_registrar_.Add(prefs::kWebRTCIPHandlingPolicy,
                                      renderer_callback);
   profile_pref_change_registrar_.Add(prefs::kWebRTCUDPPortRange,

chrome/common/extensions/api/privacy.json

@@ -25,12 +25,6 @@
             "value": ["networkPredictionEnabled", {"type":"boolean"}],
             "description": "If enabled, Chrome attempts to speed up your web browsing experience by pre-resolving DNS entries and preemptively opening TCP and SSL connections to servers. This preference only affects actions taken by Chrome's internal prediction service. It does not affect webpage-initiated prefectches or preconnects. This preference's value is a boolean, defaulting to <code>true</code>."
           },
-          "webRTCNonProxiedUdpEnabled": {
-            "$ref": "types.ChromeSetting",
-            "value": ["webRTCNonProxiedUdpEnabled", {"type":"boolean"}],
-            "deprecated": "Please use privacy.network.webRTCIPHandlingPolicy. This remains for backward compatibility in this release and will be removed in the future.",
-            "description": "If enabled, Chrome is allowed to use non-proxied UDP to connect to peers or TURN servers when using WebRTC. Since most proxy servers don't handle UDP, using UDP possibly exposes user's IP address. Turning this off effectively forces WebRTC to only use TCP for now, until UDP proxy support is available in Chrome and such proxies are widely deployed. As a result, it also might hurt media performance and increase the load for proxy servers. This preference's value is a boolean, defaulting to <code>true</code>."
-          },
           "webRTCIPHandlingPolicy": {
             "$ref": "types.ChromeSetting",
             "value": ["webRTCIPHandlingPolicy", {"$ref":"IPHandlingPolicy"}],

chrome/common/pref_names.cc

@@ -1544,12 +1544,6 @@ const char kToolbarIconSurfacingBubbleLastShowTime[] =
     "toolbar_icon_surfacing_bubble_show_time";
 #endif
 
-// Whether WebRTC should use non-proxied UDP. If false, WebRTC will not send UDP
-// unless it goes through a proxy (i.e RETURN when it's available).  If no UDP
-// proxy is configured, it will not send UDP.  If true, WebRTC will send UDP
-// regardless of whether or not a proxy is configured. TODO(guoweis): Remove
-// this at M50.
-const char kWebRTCNonProxiedUdpEnabled[] = "webrtc.nonproxied_udp_enabled";
 // Define the IP handling policy override that WebRTC should follow. When not
 // set, it defaults to "default".
 const char kWebRTCIPHandlingPolicy[] = "webrtc.ip_handling_policy";

chrome/test/data/extensions/api_test/preference/standard/test.js

@@ -15,7 +15,6 @@ var preferences_to_test = [
     root: chrome.privacy.network,
     preferences: {
       networkPredictionEnabled: false,
-      webRTCNonProxiedUdpEnabled: false,
     }
   },
   {
@@ -47,9 +46,7 @@ var preferences_to_test = [
 
 // Some preferences are only present on certain platforms or are hidden
 // behind flags and might not be present when this test runs.
-var possibly_missing_preferences = new Set([
-  'webRTCNonProxiedUdpEnabled',          // requires ENABLE_WEBRTC=1
-]);
+var possibly_missing_preferences = new Set();
 
 if (!navigator.userAgent.includes('Windows') &&
     !navigator.userAgent.includes('CrOS')) {