Disable test and remove the reference of enable_localhost_ice_candidate

content/renderer/media/rtc_peer_connection_handler.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 "content/renderer/media/rtc_peer_connection_handler.h"
 
 #include <string>
 #include <utility>
 #include <vector>
 
@@ skipping 168 matching lines @@
     description->ToString(sdp);
     *type = description->type();
   }
 }
 
 // Converter functions from WebKit types to WebRTC types.
 
 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()) {
     case blink::WebRTCIceTransportsNone:
       webrtc_config->type = webrtc::PeerConnectionInterface::kNone;
       break;
     case blink::WebRTCIceTransportsRelay:
       webrtc_config->type = webrtc::PeerConnectionInterface::kRelay;
       break;
     case blink::WebRTCIceTransportsAll:
@@ skipping 1446 matching lines @@
 }
 
 void RTCPeerConnectionHandler::ResetUMAStats() {
   DCHECK(thread_checker_.CalledOnValidThread());
   num_local_candidates_ipv6_ = 0;
   num_local_candidates_ipv4_ = 0;
   ice_connection_checking_start_ = base::TimeTicks();
   memset(ice_state_seen_, 0, sizeof(ice_state_seen_));
 }
 }  // namespace content