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

chrome/browser/renderer_preferences_util.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/renderer_preferences_util.h"
 
 #include "base/macros.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/common/pref_names.h"
 #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)
 #include "ui/gfx/font_render_params.h"
 #endif
 
 #if !defined(OS_ANDROID)
 #include "components/ui/zoom/zoom_controller.h"
 #endif
 
@@ skipping 11 matching lines @@
 
 void UpdateFromSystemSettings(content::RendererPreferences* prefs,
                               Profile* profile,
                               content::WebContents* web_contents) {
   const PrefService* pref_service = profile->GetPrefs();
   prefs->accept_languages = pref_service->GetString(prefs::kAcceptLanguages);
   prefs->enable_referrers = pref_service->GetBoolean(prefs::kEnableReferrers);
   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;
   bool default_zoom_level_set = false;
 #if !defined(OS_ANDROID)
   ui_zoom::ZoomController* zoom_controller =
       ui_zoom::ZoomController::FromWebContents(web_contents);
   if (zoom_controller) {
     default_zoom_level = zoom_controller->GetDefaultZoomLevel();
     default_zoom_level_set = true;
@@ skipping 55 matching lines @@
   prefs->subpixel_rendering = params.subpixel_rendering;
 #endif
 
 #if !defined(OS_MACOSX)
   prefs->plugin_fullscreen_allowed =
       pref_service->GetBoolean(prefs::kFullscreenAllowed);
 #endif
 }
 
 }  // namespace renderer_preferences_util