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

chrome/browser/extensions/api/preference/preference_apitest.cc

Index: chrome/browser/extensions/api/preference/preference_apitest.cc
diff --git a/chrome/browser/extensions/api/preference/preference_apitest.cc b/chrome/browser/extensions/api/preference/preference_apitest.cc
index f9461a495b12222f7e0cfc36d6f3967910e35e32..8dfb7421973d31ab63fece925090f4290f9311ff 100644
--- a/chrome/browser/extensions/api/preference/preference_apitest.cc
+++ b/chrome/browser/extensions/api/preference/preference_apitest.cc
@@ -21,6 +21,7 @@
 #include "components/password_manager/core/common/password_manager_pref_names.h"
 #include "components/translate/core/common/translate_pref_names.h"
 #include "content/public/browser/notification_service.h"
+#include "content/public/common/webrtc_ip_handling_policy.h"
 #include "extensions/browser/extension_registry.h"
 #include "extensions/browser/test_extension_registry_observer.h"
 #include "extensions/test/extension_test_message_listener.h"
@@ -125,8 +126,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionPreferenceApiTest, MAYBE_Standard) {
   prefs->SetBoolean(prefs::kSafeBrowsingEnabled, false);
   prefs->SetBoolean(prefs::kSearchSuggestEnabled, false);
 #if defined(ENABLE_WEBRTC)
-  prefs->SetBoolean(prefs::kWebRTCMultipleRoutesEnabled, false);
-  prefs->SetBoolean(prefs::kWebRTCNonProxiedUdpEnabled, false);
+  prefs->SetString(prefs::kWebRTCIPHandlingPolicy,

[Devlin, 2015/10/27 16:13:31]

I'm a little worried that it looks like all tests for the old prefs are removed,
but we'll still need the functionality there... Why not leave the old tests in,
and add new ones?

[guoweis_left_chromium, 2015/10/27 20:32:00]

Done.

+                   content::kWebRTCIPHandlingDefaultPublicInterfaceOnly);
 #endif
 
   const char kExtensionPath[] = "preference/standard";