Reland of Adding the ability to change ICE servers through SetConfiguration.

talk/app/webrtc/portallocatorfactory.cc

Index: talk/app/webrtc/portallocatorfactory.cc
diff --git a/talk/app/webrtc/portallocatorfactory.cc b/talk/app/webrtc/portallocatorfactory.cc
index bd6caccc80f8cd8999eb4214312d04c9993c22e4..33e0e63102051ab539e032e14e2472cca4194fd2 100644
--- a/talk/app/webrtc/portallocatorfactory.cc
+++ b/talk/app/webrtc/portallocatorfactory.cc
@@ -71,15 +71,15 @@ cricket::PortAllocator* PortAllocatorFactory::CreatePortAllocator(
 
   for (size_t i = 0; i < turn.size(); ++i) {
     cricket::RelayCredentials credentials(turn[i].username, turn[i].password);
-    cricket::RelayServerConfig relay_server(cricket::RELAY_TURN);
+    cricket::RelayServerConfig turn_server(cricket::RELAY_TURN);
     cricket::ProtocolType protocol;
     if (cricket::StringToProto(turn[i].transport_type.c_str(), &protocol)) {
-      relay_server.ports.push_back(cricket::ProtocolAddress(
-          turn[i].server, protocol, turn[i].secure));
-      relay_server.credentials = credentials;
+      turn_server.ports.push_back(
+          cricket::ProtocolAddress(turn[i].server, protocol, turn[i].secure));
+      turn_server.credentials = credentials;
       // First in the list gets highest priority.
-      relay_server.priority = static_cast<int>(turn.size() - i - 1);
-      allocator->AddRelay(relay_server);
+      turn_server.priority = static_cast<int>(turn.size() - i - 1);
+      allocator->AddTurnServer(turn_server);
     } else {
       LOG(LS_WARNING) << "Ignoring TURN server " << turn[i].server << ". "
                       << "Reason= Incorrect " << turn[i].transport_type