Remove obsolete webrtc.multiple_routes_enabled pref

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

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

@@ -129,11 +129,6 @@ const PrefMappingEntry kPrefMapping[] = {
      APIPermission::kPrivacy, APIPermission::kPrivacy},
     {"translationServiceEnabled", prefs::kOfferTranslateEnabled,
      APIPermission::kPrivacy, APIPermission::kPrivacy},
-    // webRTCMultipleRoutesEnabled and webRTCNonProxiedUdpEnabled have been
-    // replaced by webRTCIPHandlingPolicy. Leaving it for backward
-    // compatibility. TODO(guoweis): Remove this in M50.
-    {"webRTCMultipleRoutesEnabled", prefs::kWebRTCMultipleRoutesEnabled,
-     APIPermission::kPrivacy, APIPermission::kPrivacy},
     {"webRTCNonProxiedUdpEnabled", prefs::kWebRTCNonProxiedUdpEnabled,
      APIPermission::kPrivacy, APIPermission::kPrivacy},
     {"webRTCIPHandlingPolicy", prefs::kWebRTCIPHandlingPolicy,

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::kWebRTCMultipleRoutesEnabled, false);
   prefs->SetBoolean(prefs::kWebRTCNonProxiedUdpEnabled, false);
   prefs->SetString(prefs::kWebRTCIPHandlingPolicy,
                    blink::kWebRTCIPHandlingDefaultPublicInterfaceOnly);

chrome/browser/renderer_preferences_util.cc

@@ -120,14 +120,10 @@ void UpdateFromSystemSettings(blink::RendererPreferences* prefs,
 
   // Handling the backward compatibility of previous boolean versions of policy
   // controls.
-  if (!pref_service->HasPrefPath(prefs::kWebRTCIPHandlingPolicy)) {
-    if (!pref_service->GetBoolean(prefs::kWebRTCNonProxiedUdpEnabled)) {
-      prefs->webrtc_ip_handling_policy =
-          blink::kWebRTCIPHandlingDisableNonProxiedUdp;
-    } else if (!pref_service->GetBoolean(prefs::kWebRTCMultipleRoutesEnabled)) {
-      prefs->webrtc_ip_handling_policy =
-          blink::kWebRTCIPHandlingDefaultPublicInterfaceOnly;
-    }
+  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 =

chrome/browser/ui/browser_ui_prefs.cc

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

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::kWebRTCMultipleRoutesEnabled,
-                                     renderer_callback);
   profile_pref_change_registrar_.Add(prefs::kWebRTCNonProxiedUdpEnabled,
                                      renderer_callback);
   profile_pref_change_registrar_.Add(prefs::kWebRTCIPHandlingPolicy,

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>."
           },
-          "webRTCMultipleRoutesEnabled": {
-            "$ref": "types.ChromeSetting",
-            "value": ["webRTCMultipleRoutesEnabled", {"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 will explore all possible routing options when using WebRTC to find the most performant path, possibly exposing user's private IP address. Otherwise, WebRTC traffic will be routed the same way as regular HTTP. This preference's value is a boolean, defaulting to <code>true</code>."
-          },
           "webRTCNonProxiedUdpEnabled": {
             "$ref": "types.ChromeSetting",
             "value": ["webRTCNonProxiedUdpEnabled", {"type":"boolean"}],

chrome/common/pref_names.cc

@@ -1544,10 +1544,6 @@ const char kToolbarIconSurfacingBubbleLastShowTime[] =
     "toolbar_icon_surfacing_bubble_show_time";
 #endif
 
-// Whether WebRTC should bind to individual NICs to explore all possible routing
-// options. Default is true. This has become obsoleted and replaced by
-// kWebRTCIPHandlingPolicy. TODO(guoweis): Remove this at M50.
-const char kWebRTCMultipleRoutesEnabled[] = "webrtc.multiple_routes_enabled";
 // 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

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,
-      webRTCMultipleRoutesEnabled: false,
       webRTCNonProxiedUdpEnabled: false,
     }
   },
@@ -49,7 +48,6 @@ 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([
-  'webRTCMultipleRoutesEnabled',         // requires ENABLE_WEBRTC=1
   'webRTCNonProxiedUdpEnabled',          // requires ENABLE_WEBRTC=1
 ]);