Disable test and remove the reference of enable_localhost_ice_candidate

content/renderer/media/rtc_peer_connection_handler.cc

Index: content/renderer/media/rtc_peer_connection_handler.cc
diff --git a/content/renderer/media/rtc_peer_connection_handler.cc b/content/renderer/media/rtc_peer_connection_handler.cc
index b47ea7e6022065231b68b8d341b87acb877ac1f4..339a36f1adf198f2240ccd0d810ad44b508d616a 100644
--- a/content/renderer/media/rtc_peer_connection_handler.cc
+++ b/content/renderer/media/rtc_peer_connection_handler.cc
@@ -186,31 +186,18 @@ void GetSdpAndTypeFromSessionDescription(
 void GetNativeRtcConfiguration(
     const blink::WebRTCConfiguration& blink_config,
     webrtc::PeerConnectionInterface::RTCConfiguration* webrtc_config) {
-  DCHECK_EQ(webrtc_config->enable_localhost_ice_candidate, false);
-
-  // When we don't have WebRTCConfiguration, treat it as a special case where we
-  // should generate local host candidate. This will only be honored if
-  // enable_multiple_routes is disabled.
-  if (blink_config.isNull()) {
-    webrtc_config->enable_localhost_ice_candidate = true;
+  if (blink_config.isNull() || !webrtc_config)

[tommi (sloooow) - chröme, 2015/10/23 16:00:23]

the webrtc_config wasn't allowed to be null before, right?  If so, I suggest we
continue to treat that as an invalid case and have a DCHECK(webrtc_config) at
the top of the function instead of the second check here.

     return;
-  }
-
-  if (blink_config.iceServers().isNull()) {
-    // Same as when iceServers is undefined or unspecified.
-    webrtc_config->enable_localhost_ice_candidate = true;
-  } else {
-    for (size_t i = 0; i < blink_config.iceServers().numberOfServers(); ++i) {
-      webrtc::PeerConnectionInterface::IceServer server;
-      const blink::WebRTCICEServer& webkit_server =
-          blink_config.iceServers().server(i);
-      server.username =
-          base::UTF16ToUTF8(base::StringPiece16(webkit_server.username()));
-      server.password =
-          base::UTF16ToUTF8(base::StringPiece16(webkit_server.credential()));
-      server.uri = webkit_server.uri().spec();
-      webrtc_config->servers.push_back(server);
-    }
+  for (size_t i = 0; i < blink_config.numberOfServers(); ++i) {

[tommi (sloooow) - chröme, 2015/10/23 16:00:23]

nit: add an empty line above this one for readability.

+    webrtc::PeerConnectionInterface::IceServer server;
+    const blink::WebRTCICEServer& webkit_server =
+        blink_config.server(i);
+    server.username =
+        base::UTF16ToUTF8(base::StringPiece16(webkit_server.username()));
+    server.password =
+        base::UTF16ToUTF8(base::StringPiece16(webkit_server.credential()));
+    server.uri = webkit_server.uri().spec();
+    webrtc_config->servers.push_back(server);
   }
 
   switch (blink_config.iceTransports()) {