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

content/renderer/media/webrtc/peer_connection_dependency_factory.cc

 // Copyright 2014 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 "content/renderer/media/webrtc/peer_connection_dependency_factory.h"
 
 #include <vector>
 
 #include "base/command_line.h"
 #include "base/location.h"
 #include "base/logging.h"
 #include "base/metrics/field_trial.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/waitable_event.h"
 #include "content/common/media/media_stream_messages.h"
 #include "content/public/common/content_client.h"
 #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"
 #include "content/renderer/media/media_stream_audio_source.h"
 #include "content/renderer/media/media_stream_video_source.h"
 #include "content/renderer/media/media_stream_video_track.h"
 #include "content/renderer/media/peer_connection_identity_store.h"
 #include "content/renderer/media/rtc_media_constraints.h"
 #include "content/renderer/media/rtc_peer_connection_handler.h"
 #include "content/renderer/media/rtc_video_decoder_factory.h"
@@ skipping 24 matching lines @@
 #include "third_party/WebKit/public/platform/WebURL.h"
 #include "third_party/WebKit/public/web/WebDocument.h"
 #include "third_party/WebKit/public/web/WebFrame.h"
 #include "third_party/libjingle/source/talk/app/webrtc/mediaconstraintsinterface.h"
 #include "third_party/webrtc/base/ssladapter.h"
 
 #if defined(OS_ANDROID)
 #include "media/base/android/media_codec_bridge.h"
 #endif
 
+namespace {
+
+enum WebRTCIPHandlingPolicy {
+  DEFAULT,
+  DEFAULT_PUBLIC_INTERFACE_ONLY,
+  DISABLE_NON_PROXIED_UDP,
+};
+
+WebRTCIPHandlingPolicy 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.
 struct {
   const char* constraint;
   const media::AudioParameters::PlatformEffectsMask effect;
 } const kConstraintEffectMap[] = {
   { webrtc::MediaConstraintsInterface::kGoogEchoCancellation,
     media::AudioParameters::ECHO_CANCELLER },
 };
@@ skipping 373 matching lines @@
     VLOG(3) << "WebRTC routing preferences will not be enforced";
   } else {
     if (web_frame && web_frame->view()) {
       RenderViewImpl* renderer_view_impl =
           RenderViewImpl::FromWebView(web_frame->view());
       if (renderer_view_impl) {
         // TODO(guoweis): |enable_multiple_routes| should be renamed to
         // |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;
-        VLOG(3) << "WebRTC routing preferences: multiple_routes: "
-                << port_config.enable_multiple_routes
+        std::string mode = renderer_view_impl->renderer_preferences()
+                               .webrtc_ip_handling_policy;
+        switch (GetWebRTCIPHandlingPolicy(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;
+        }
+
+        VLOG(3) << "WebRTC routing preferences: "
+                << "policy: " << mode
+                << ", multiple_routes: " << port_config.enable_multiple_routes
                 << ", nonproxied_udp: " << port_config.enable_nonproxied_udp;
       }
     }
     if (port_config.enable_multiple_routes) {
       bool create_media_permission =
           base::CommandLine::ForCurrentProcess()->HasSwitch(
               switches::kEnforceWebRtcIPPermissionCheck);
       create_media_permission =
           create_media_permission ||
           StartsWith(base::FieldTrialList::FindFullName(
@@ skipping 279 matching lines @@
 }
 
 void PeerConnectionDependencyFactory::EnsureWebRtcAudioDeviceImpl() {
   if (audio_device_.get())
     return;
 
   audio_device_ = new WebRtcAudioDeviceImpl();
 }
 
 }  // namespace content