Change WebRTC IP handling policy from multiple booleans to an enum.

chrome/browser/renderer_preferences_util.cc

Index: chrome/browser/renderer_preferences_util.cc
diff --git a/chrome/browser/renderer_preferences_util.cc b/chrome/browser/renderer_preferences_util.cc
index f7628fed8b9171dca25e6d165ad0123916c76cd0..dc7d3a51aa1550f3285e1d13825e7d8d6da86d3e 100644
--- a/chrome/browser/renderer_preferences_util.cc
+++ b/chrome/browser/renderer_preferences_util.cc
@@ -11,6 +11,7 @@
 #include "content/public/browser/host_zoom_map.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/renderer_preferences.h"
+#include "content/public/renderer/webrtc_ip_handling_policy.h"
 #include "third_party/skia/include/core/SkColor.h"
 
 #if defined(OS_LINUX) || defined(OS_ANDROID)
@@ -42,10 +43,20 @@ void UpdateFromSystemSettings(content::RendererPreferences* prefs,
   prefs->enable_do_not_track =
       pref_service->GetBoolean(prefs::kEnableDoNotTrack);
 #if defined(ENABLE_WEBRTC)
-  prefs->enable_webrtc_multiple_routes =
+  // If the new IPHandlingPolicy is set OR the original multi-routes is not set
+  // OR if it was set to true, we could just honor the new IPHandlingPolicy one.
+  bool ignore_multiroutes_option =
+      pref_service->HasPrefPath(prefs::kWebRTCIPHandlingPolicy) ||
+      !pref_service->HasPrefPath(prefs::kWebRTCMultipleRoutesEnabled) ||
       pref_service->GetBoolean(prefs::kWebRTCMultipleRoutesEnabled);

[pthatcher1, 2015/10/23 17:27:29]

What if someone had webRTCNonProxiedUdpEnabled set before?  Do we just throw
that knowledge away?

[pthatcher1, 2015/10/23 17:27:29]

This might be more clear as:

bool enable_multiple_routes = 
  !pref_service->HasPrefPath(prefs::kWebRTCIPHandlingPolicy) &&
  (!pref_service->HasPrefPath(prefs::kWebRTCMultipleRoutesEnabled) ||
   pref_service->GetBoolean(prefs::kWebRTCMultipleRoutesEnabled));

[guoweis_left_chromium, 2015/10/23 18:24:59]

webRTCNonProxiedUdpEnabled is still in beta. I'm trying to get this in M47 to
prevent people from using that.

[guoweis_left_chromium, 2015/10/23 18:24:59]

I don't feel this is clear. We could chat if you feel strongly.

-  prefs->enable_webrtc_nonproxied_udp =
-      pref_service->GetBoolean(prefs::kWebRTCNonProxiedUdpEnabled);
+
+  if (ignore_multiroutes_option) {
+    prefs->webrtc_ip_handling_policy =
+        pref_service->GetString(prefs::kWebRTCIPHandlingPolicy);
+  } else {
+    prefs->webrtc_ip_handling_policy =
+        content::kWebRTCIPHandlingDefaultPublicInterfaceOnly;
+  }
 #endif
 
   double default_zoom_level = 0;