Changes needed to roll libjingle r141

jingle/notifier/communicator/xmpp_connection_generator.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.
 //
 // XmppConnectionGenerator does the following algorithm:
 //   proxy = ResolveProxyInformation(connection_options)
 //   for server in server_list
 //     get dns_addresses for server
 //     connection_list = (dns_addresses X connection methods X proxy).shuffle()
 //     for connection in connection_list
@@ skipping 72 matching lines @@
   // to try.
   while (true) {
     // Iterate to the next possible connection.
     settings_index_++;
     if (settings_index_ < settings_list_->GetCount()) {
       // We have more connection settings in the settings_list_ to
       // try, kick off the next one.
       ConnectionSettings* settings =
           settings_list_->GetSettings(settings_index_);
       VLOG(1) << "*** Attempting " << PROTO_NAMES[settings->protocol()]
-              << " connection to " << settings->server().IPAsString()
+              << " connection to " << settings->server().HostAsURIString()
               << ":" << settings->server().port();
       delegate_->OnNewSettings(*settings);
       return;
     }
 
     // Iterate to the next possible server.
     if (current_server_ == servers_.end()) {
       current_server_ = servers_.begin();
     } else {
       ++current_server_;
@@ skipping 77 matching lines @@
   settings_list_->ClearPermutations();
   settings_list_->AddPermutations(
       current_server_->server.host(),
       ip_list,
       current_server_->server.port(),
       current_server_->special_port_magic,
       try_ssltcp_first_);
 }
 
 }  // namespace notifier