Roll WebRTC 11486:11495, Libjingle 11485:11495

remoting/test/fake_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.
 
 // MSVC++ requires this to be set before any other includes to get M_PI.
 #define _USE_MATH_DEFINES
 
 #include "remoting/test/fake_socket_factory.h"
 
 #include <math.h>
 #include <stddef.h>
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/location.h"
 #include "base/macros.h"
 #include "base/rand_util.h"
 #include "base/single_thread_task_runner.h"
 #include "base/thread_task_runner_handle.h"
 #include "base/time/time.h"
 #include "net/base/io_buffer.h"
 #include "remoting/test/leaky_bucket.h"
-#include "third_party/libjingle/source/talk/media/base/rtputils.h"
 #include "third_party/webrtc/base/asyncpacketsocket.h"
+#include "third_party/webrtc/media/base/rtputils.h"
 
 namespace remoting {
 
 namespace {
 
 const int kPortRangeStart = 1024;
 const int kPortRangeEnd = 65535;
 
 double GetNormalRandom(double average, double stddev) {
   // Based on Box-Muller transform, see
@@ skipping 296 matching lines @@
   UdpSocketsMap::iterator iter = udp_sockets_.find(packet.to.port());
   if (iter == udp_sockets_.end()) {
     // Invalid port number.
     return;
   }
 
   iter->second.Run(packet.from, packet.to, packet.data, packet.data_size);
 }
 
 }  // namespace remoting