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

content/renderer/media/webrtc/peer_connection_dependency_factory.cc

Index: content/renderer/media/webrtc/peer_connection_dependency_factory.cc
diff --git a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
index 34a949b750d9181e6f154e2032cf1fef8db721cb..8988323e33516040e39d5567082f30472f360e0e 100644
--- a/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
+++ b/content/renderer/media/webrtc/peer_connection_dependency_factory.cc
@@ -18,6 +18,7 @@
 #include "content/public/common/content_switches.h"
 #include "content/public/common/renderer_preferences.h"
 #include "content/public/renderer/content_renderer_client.h"
+#include "content/public/renderer/webrtc_ip_handling_policy.h"
 #include "content/renderer/media/media_stream.h"
 #include "content/renderer/media/media_stream_audio_processor.h"
 #include "content/renderer/media/media_stream_audio_processor_options.h"
@@ -62,6 +63,25 @@
 #include "media/base/android/media_codec_bridge.h"
 #endif
 
+namespace {
+
+enum WebRTCIPPermissionMode {

[pthatcher1, 2015/10/21 00:06:53]

It was called IPHandling in one place and IPPermission in another.  And policy
in one place and mode in the other.  I prefer "permission" and "policy" for a
combination of IPPermissionPolicy

[guoweis_left_chromium, 2015/10/23 16:40:49]

Renamed it to be WebRTCIPHandlingPolicy to be consistent.

+  DEFAULT,
+  DEFAULT_PUBLIC_INTERFACE_ONLY,
+  DISABLE_NON_PROXIED_UDP,
+};
+
+WebRTCIPPermissionMode GetWebRTCIPHandlingPolicy(
+    const std::string& preference) {
+  if (preference == content::kWebRTCIPHandlingDefaultPublicInterfaceOnly)
+    return DEFAULT_PUBLIC_INTERFACE_ONLY;
+  if (preference == content::kWebRTCIPHandlingDisableNonProxiedUdp)
+    return DISABLE_NON_PROXIED_UDP;
+  return DEFAULT;
+}
+
+}  // namespace
+
 namespace content {
 
 // Map of corresponding media constraints and platform effects.
@@ -455,12 +475,12 @@ PeerConnectionDependencyFactory::CreatePeerConnection(
         // |request_multiple_routes|. Whether local IP addresses could be
         // collected depends on if mic/camera permission is granted for this
         // origin.
-        port_config.enable_multiple_routes =
-            renderer_view_impl->renderer_preferences()
-                .enable_webrtc_multiple_routes;
-        port_config.enable_nonproxied_udp =
-            renderer_view_impl->renderer_preferences()
-                .enable_webrtc_nonproxied_udp;
+        WebRTCIPPermissionMode mode =
+            GetWebRTCIPHandlingPolicy(renderer_view_impl->renderer_preferences()
+                                          .webrtc_ip_handling_policy);
+
+        port_config.enable_multiple_routes = (mode == DEFAULT);
+        port_config.enable_nonproxied_udp = (mode != DISABLE_NON_PROXIED_UDP);

[pthatcher1, 2015/10/21 00:06:53]

I think this might be more clear as:

switch(mode) {
  case DEFAULT_PUBLIC_INTERFACE_ONLY:
    port_config.enable_multiple_routes = false;
    port_config.enable_nonproxied_udp = true;
    break;
  case DISABLE_NON_PROXIED_UDP:
    port_config.enable_multiple_routes = false;
    port_config.enable_nonproxied_udp = false;
  default:
    port_config.enable_multiple_routes = true;
    port_config.enable_nonproxied_udp = true;
    break;
}

[guoweis_left_chromium, 2015/10/23 16:40:49]

Done.

         VLOG(3) << "WebRTC routing preferences: multiple_routes: "
                 << port_config.enable_multiple_routes
                 << ", nonproxied_udp: " << port_config.enable_nonproxied_udp;