Improving the fake clock and using it to fix a flaky STUN timeout test.

webrtc/base/timeutils.h

 /*
  *  Copyright 2005 The WebRTC Project Authors. All rights reserved.
  *
  *  Use of this source code is governed by a BSD-style license
  *  that can be found in the LICENSE file in the root of the source
  *  tree. An additional intellectual property rights grant can be found
  *  in the file PATENTS.  All contributing project authors may
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
@@ skipping 21 matching lines @@
 // TODO(honghaiz): Define a type for the time value specifically.
 
 class ClockInterface {
  public:
   virtual ~ClockInterface() {}
   virtual uint64_t TimeNanos() const = 0;
 };
 
 // Sets the global source of time. This is useful mainly for unit tests.
 //
-// Does not transfer ownership of the clock.
-// SetClock(nullptr) should be called before the ClockInterface is deleted.
+// Returns the previously set ClockInterface, or nullptr if none is set.
+//
+// Does not transfer ownership of the clock. SetClockForTesting(nullptr)
+// should be called before the ClockInterface is deleted.
 //
 // This method is not thread-safe; it should only be used when no other thread
 // is running (for example, at the start/end of a unit test, or start/end of
 // main()).
 //
 // TODO(deadbeef): Instead of having functions that access this global

[nisse-webrtc, 2016/06/08 09:47:30]

I don't think it's a good idea to pass around the clock everywhere (even if
there's some code using webrtc::Clock doing that).

Except maybe if we can cut down a lot on the number of places where the clock is
read. And in many cases, I think passing the current time as an argument
downstream makes more sense than passing down a clock object.

 // ClockInterface, we may want to pass the ClockInterface into everything
 // that uses it, eliminating the need for a global variable and this function.
-void SetClock(ClockInterface* clock);
+ClockInterface* SetClockForTesting(ClockInterface* clock);
 
 // Returns the current time in milliseconds in 32 bits.
 uint32_t Time32();
 
 // Returns the current time in milliseconds in 64 bits.
 int64_t TimeMillis();
 // Deprecated. Do not use this in any new code.
 inline int64_t Time() {
   return TimeMillis();
 }
@@ skipping 34 matching lines @@
 };
 
 // Convert from std::tm, which is relative to 1900-01-01 00:00 to number of
 // seconds from 1970-01-01 00:00 ("epoch").  Don't return time_t since that
 // is still 32 bits on many systems.
 int64_t TmToSeconds(const std::tm& tm);
 
 }  // namespace rtc
 
 #endif  // WEBRTC_BASE_TIMEUTILS_H_