New libjingle integrated to chrome.

chrome/common/net/notifier/communicator/connection_settings.cc

 // Copyright (c) 2009 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 <algorithm>
 #include <deque>
 #include <string>
 #include <vector>
 
 #include "base/logging.h"
 #include "chrome/common/net/notifier/communicator/connection_settings.h"
 #include "talk/base/helpers.h"
 #include "talk/xmpp/xmppclientsettings.h"
 
 namespace notifier {
 
 class RandomGenerator {
  public:
   int operator()(int ceiling) {
-    return static_cast<int>(cricket::CreateRandomId() % ceiling);
+    return static_cast<int>(talk_base::CreateRandomId() % ceiling);
   }
 };
 
 void ConnectionSettings::FillXmppClientSettings(
     buzz::XmppClientSettings* xcs) const {
   DCHECK(xcs);
   xcs->set_protocol(protocol_);
   xcs->set_server(server_);
   xcs->set_proxy(proxy_.type);
   if (proxy_.type != talk_base::PROXY_NONE) {
@@ skipping 20 matching lines @@
   RandomGenerator rg;
   std::random_shuffle(iplist_random.begin(), iplist_random.end(), rg);
 
   // Put generated addresses in a new deque, then append on the list_, since
   // there are order dependencies and AddPermutations() may be called more
   // than once.
   std::deque<ConnectionSettings> list_temp;
 
   // Permute addresses for this server. In some cases we haven't resolved the
   // to ip addresses.
-  talk_base::SocketAddress server(hostname, port, false);
+  talk_base::SocketAddress server(hostname, port);
   if (iplist_random.empty()) {
     // We couldn't pre-resolve the hostname, so let's hope it will resolve
     // further down the pipeline (by a proxy, for example).
     PermuteForAddress(server, special_port_magic, proxy_only, &list_temp);
   } else {
     // Generate a set of possibilities for each server address.
     // Don't do permute duplicates.
     for (size_t index = 0; index < iplist_random.size(); ++index) {
       if (std::find(iplist_seen_.begin(), iplist_seen_.end(),
                     iplist_random[index]) != iplist_seen_.end()) {
@@ skipping 47 matching lines @@
 
       if (special_port_magic) {
         settings.set_protocol(cricket::PROTO_SSLTCP);
         settings.mutable_server()->SetPort(443);
         list_temp->push_back(settings);
       }
     }
   }
 }
 }  // namespace notifier