Roll libjingle to r124 and roll webrtc to 1888.

jingle/notifier/communicator/xmpp_connection_generator.cc

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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
 //       yield connection
@@ skipping 142 matching lines @@
       first_dns_error_ = status;
     return;
   }
 
   // Slurp the addresses into a vector.
   std::vector<uint32> ip_list;
   for (const addrinfo* addr = address_list_.head();
        addr != NULL; addr = addr->ai_next) {
     const sockaddr_in& sockaddr =
         *reinterpret_cast<const sockaddr_in*>(addr->ai_addr);
-    uint32 ip = ntohl(sockaddr.sin_addr.s_addr);
+    uint32 ip = talk_base::NetworkToHost32(sockaddr.sin_addr.s_addr);
     ip_list.push_back(ip);
   }
   successfully_resolved_dns_ = !ip_list.empty();
 
   for (int i = 0; i < static_cast<int>(ip_list.size()); ++i) {
     VLOG(1) << "  ip " << i
             << " : " << talk_base::SocketAddress::IPToString(ip_list[i]);
   }
 
   GenerateSettingsForIPList(ip_list);
 }
 
 void XmppConnectionGenerator::GenerateSettingsForIPList(
     const std::vector<uint32>& ip_list) {
   // Build the ip list.
   DCHECK(settings_list_.get());
   settings_index_ = -1;
   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