Update webrtc&libjingle 6774:6825.

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"
 #include "base/values.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_util.h"
-#include "third_party/libjingle/source/talk/base/byteorder.h"
-#include "third_party/libjingle/source/talk/base/socketaddress.h"
 #include "third_party/libjingle/source/talk/p2p/base/candidate.h"
+#include "third_party/webrtc/base/byteorder.h"
+#include "third_party/webrtc/base/socketaddress.h"
 
 namespace jingle_glue {
 
 bool IPEndPointToSocketAddress(const net::IPEndPoint& ip_endpoint,
-                               talk_base::SocketAddress* address) {
+                               rtc::SocketAddress* address) {
   sockaddr_storage addr;
   socklen_t len = sizeof(addr);
   return ip_endpoint.ToSockAddr(reinterpret_cast<sockaddr*>(&addr), &len) &&
-      talk_base::SocketAddressFromSockAddrStorage(addr, address);
+      rtc::SocketAddressFromSockAddrStorage(addr, address);
 }
 
-bool SocketAddressToIPEndPoint(const talk_base::SocketAddress& address,
+bool SocketAddressToIPEndPoint(const rtc::SocketAddress& address,
                                net::IPEndPoint* ip_endpoint) {
   sockaddr_storage addr;
   int size = address.ToSockAddrStorage(&addr);
   return (size > 0) &&
       ip_endpoint->FromSockAddr(reinterpret_cast<sockaddr*>(&addr), size);
 }
 
 std::string SerializeP2PCandidate(const cricket::Candidate& candidate) {
   // TODO(sergeyu): Use SDP to format candidates?
   base::DictionaryValue value;
@@ skipping 35 matching lines @@
       !dic_value->GetInteger("port", &port) ||
       !dic_value->GetString("type", &type) ||
       !dic_value->GetString("protocol", &protocol) ||
       !dic_value->GetString("username", &username) ||
       !dic_value->GetString("password", &password) ||
       !dic_value->GetDouble("preference", &preference) ||
       !dic_value->GetInteger("generation", &generation)) {
     return false;
   }
 
-  candidate->set_address(talk_base::SocketAddress(ip, port));
+  candidate->set_address(rtc::SocketAddress(ip, port));
   candidate->set_type(type);
   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