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

chrome/common/pref_names.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/common/pref_names.h"
 
 #include "base/basictypes.h"
 #include "chrome/common/pref_font_webkit_names.h"
 
 namespace prefs {
@@ skipping 1179 matching lines @@
 
 // Used to indicate whether or not the toolbar redesign bubble has been shown
 // and acknowledged, and the last time the bubble was shown.
 const char kToolbarIconSurfacingBubbleAcknowledged[] =
     "toolbar_icon_surfacing_bubble_acknowledged";
 const char kToolbarIconSurfacingBubbleLastShowTime[] =
     "toolbar_icon_surfacing_bubble_show_time";
 #endif
 
 #if defined(ENABLE_WEBRTC)
-// Whether WebRTC should bind to individual NICs to explore all possible routing
-// options. Default is true.
-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
-// regardless of whether or not a proxy is configured.
-const char kWebRTCNonProxiedUdpEnabled[] =
-    "webrtc.nonproxied_udp_enabled";
+// Define the IP handling policy override that WebRTC should follow. When not
+// set, it defaults to "default".

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

We should probably define what "default" means.  I assume it means something
like "do what Chrome does with no preference set".

+const char kWebRTCIPHandlingPolicy[] = "webrtc.ip_handling_policy";
 #endif
 
 // *************** LOCAL STATE ***************
 // These are attached to the machine/installation
 
 // A pref to configure networks device-wide. Its value must be a list of
 // NetworkConfigurations according to the OpenNetworkConfiguration
 // specification.
 // Currently, this pref is only used to store the policy. The user's
 // configuration is still stored in Shill.
@@ skipping 963 matching lines @@
     "supervised_users.whitelists";
 
 #if defined(ENABLE_EXTENSIONS)
 // Policy that indicates how to handle animated images.
 const char kAnimationPolicy[] = "settings.a11y.animation_policy";
 #endif
 
 const char kBackgroundTracingLastUpload[] = "background_tracing.last_upload";
 
 }  // namespace prefs