Roll WebRTC 7546:7549.

content/browser/renderer_host/p2p/socket_host.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 "content/browser/renderer_host/p2p/socket_host.h"
 
 #include "base/sys_byteorder.h"
 #include "content/browser/renderer_host/p2p/socket_host_tcp.h"
 #include "content/browser/renderer_host/p2p/socket_host_tcp_server.h"
 #include "content/browser/renderer_host/p2p/socket_host_udp.h"
 #include "content/browser/renderer_host/render_process_host_impl.h"
 #include "content/public/browser/browser_thread.h"
 #include "crypto/hmac.h"
-#include "third_party/libjingle/source/talk/p2p/base/stun.h"
 #include "third_party/webrtc/base/asyncpacketsocket.h"
 #include "third_party/webrtc/base/byteorder.h"
 #include "third_party/webrtc/base/messagedigest.h"
+#include "third_party/webrtc/p2p/base/stun.h"
 
 namespace {
 
 const uint32 kStunMagicCookie = 0x2112A442;
 const size_t kMinRtpHeaderLength = 12;
 const size_t kMinRtcpHeaderLength = 8;
 const size_t kRtpExtensionHeaderLength = 4;
 const size_t kDtlsRecordHeaderLength = 13;
 const size_t kTurnChannelHeaderLength = 4;
 const size_t kAbsSendTimeExtensionLength = 3;
@@ skipping 610 matching lines @@
   BrowserThread::PostTask(BrowserThread::UI,
                           FROM_HERE,
                           base::Bind(packet_dump_callback_,
                                      Passed(&packet_header),
                                      header_length,
                                      packet_length,
                                      incoming));
 }
 
 }  // namespace content