Roll WebRTC 11486:11495, Libjingle 11485:11495

remoting/protocol/chromium_socket_factory.cc

 // Copyright 2014 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 "remoting/protocol/chromium_socket_factory.h"
 
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time/time.h"
 #include "jingle/glue/utils.h"
 #include "net/base/io_buffer.h"
 #include "net/base/ip_endpoint.h"
 #include "net/base/net_errors.h"
 #include "net/udp/udp_server_socket.h"
 #include "remoting/protocol/socket_util.h"
-#include "third_party/libjingle/source/talk/media/base/rtputils.h"
 #include "third_party/webrtc/base/asyncpacketsocket.h"
 #include "third_party/webrtc/base/nethelpers.h"
+#include "third_party/webrtc/media/base/rtputils.h"
 
 namespace remoting {
 namespace protocol {
 
 namespace {
 
 // Size of the buffer to allocate for RecvFrom().
 const int kReceiveBufferSize = 65536;
 
 // Maximum amount of data in the send buffers. This is necessary to
@@ skipping 370 matching lines @@
   return nullptr;
 }
 
 rtc::AsyncResolverInterface*
 ChromiumPacketSocketFactory::CreateAsyncResolver() {
   return new rtc::AsyncResolver();
 }
 
 }  // namespace protocol
 }  // namespace remoting