Roll WebRTC 7546:7549.

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/p2p/base/candidate.h"
 #include "third_party/webrtc/base/byteorder.h"
 #include "third_party/webrtc/base/socketaddress.h"
+#include "third_party/webrtc/p2p/base/candidate.h"
 
 namespace jingle_glue {
 
 bool IPEndPointToSocketAddress(const net::IPEndPoint& ip_endpoint,
                                rtc::SocketAddress* address) {
   sockaddr_storage addr;
   socklen_t len = sizeof(addr);
   return ip_endpoint.ToSockAddr(reinterpret_cast<sockaddr*>(&addr), &len) &&
       rtc::SocketAddressFromSockAddrStorage(addr, address);
 }
@@ skipping 59 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