Changes needed to roll libjingle r141

jingle/glue/utils.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 "jingle/glue/utils.h"
 
 #include "base/json/json_reader.h"
 #include "base/json/json_writer.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 24 matching lines @@
   net::IPAddressNumber address;
   address.resize(net::kIPv4AddressSize);
   memcpy(&address[0], &ip, net::kIPv4AddressSize);
   *address_chrome = net::IPEndPoint(address, address_lj.port());
   return true;
 }
 
 std::string SerializeP2PCandidate(const cricket::Candidate& candidate) {
   // TODO(sergeyu): Use SDP to format candidates?
   DictionaryValue value;
-  value.SetString("ip", candidate.address().IPAsString());
+  value.SetString("ip", candidate.address().ipaddr().ToString());
   value.SetInteger("port", candidate.address().port());
   value.SetString("type", candidate.type());
   value.SetString("protocol", candidate.protocol());
   value.SetString("username", candidate.username());
   value.SetString("password", candidate.password());
   value.SetDouble("preference", candidate.preference());
   value.SetInteger("generation", candidate.generation());
 
   std::string result;
   base::JSONWriter::Write(&value, &result);
@@ skipping 35 matching lines @@
   candidate->set_protocol(protocol);
   candidate->set_username(username);
   candidate->set_password(password);
   candidate->set_preference(static_cast<float>(preference));
   candidate->set_generation(generation);
 
   return true;
 }
 
 }  // namespace jingle_glue