Roll WebRTC 15242:15257 (14 commits)

content/browser/renderer_host/p2p/socket_host_udp_unittest.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_udp.h"
 
 #include <stdint.h>
 #include <deque>
 #include <utility>
 #include <vector>
@@ skipping 21 matching lines @@
 // TODO(nisse): We can't currently use rtc::ScopedFakeClock, because
 // we don't link with webrtc rtc_base_tests_utils. So roll our own.
 
 // Creating an object of this class makes rtc::TimeMicros() and
 // related functions return zero unless the clock is advanced.
 class ScopedFakeClock : public rtc::ClockInterface {
  public:
   ScopedFakeClock() { prev_clock_ = rtc::SetClockForTesting(this); }
   ~ScopedFakeClock() override { rtc::SetClockForTesting(prev_clock_); }
   // ClockInterface implementation.
-  uint64_t TimeNanos() const override { return time_nanos_; }
+  int64_t TimeNanos() const override { return time_nanos_; }
   void SetTimeNanos(uint64_t time_nanos) { time_nanos_ = time_nanos; }
 
  private:
   ClockInterface* prev_clock_;
   uint64_t time_nanos_ = 0;
 };
 
 class FakeDatagramServerSocket : public net::DatagramServerSocket {
  public:
   typedef std::pair<net::IPEndPoint, std::vector<char> > UDPPacket;
@@ skipping 514 matching lines @@
   std::unique_ptr<P2PSocketHostUdp> socket_host(
       new P2PSocketHostUdp(&sender, 0, &throttler, fake_socket_factory));
   net::IPEndPoint local_address =
       ParseAddress(kTestLocalIpAddress, invalid_port);
   bool rv = socket_host->Init(local_address, min_port, max_port,
                               P2PHostAndIPEndPoint());
   EXPECT_FALSE(rv);
 }
 
 }  // namespace content