Replace Clock::CurrentNtp with Clock::CurrentNtpTime

webrtc/system_wrappers/include/clock.h

Index: webrtc/system_wrappers/include/clock.h
diff --git a/webrtc/system_wrappers/include/clock.h b/webrtc/system_wrappers/include/clock.h
index 506684496cdf00763c2c49c7199a9b6e60cfe9dc..36721fa3aaae087b7223f5119ecac5e39d79ea35 100644
--- a/webrtc/system_wrappers/include/clock.h
+++ b/webrtc/system_wrappers/include/clock.h
@@ -38,16 +38,12 @@ class Clock {
   // source is fixed for this clock.
   virtual int64_t TimeInMicroseconds() const = 0;
 
-  // Retrieve an NTP absolute timestamp in seconds and fractions of a second.
-  virtual void CurrentNtp(uint32_t& seconds, uint32_t& fractions) const = 0;
+  // Retrieve an NTP absolute timestamp.
+  virtual NtpTime CurrentNtpTime() const = 0;
 
   // Retrieve an NTP absolute timestamp in milliseconds.
   virtual int64_t CurrentNtpInMilliseconds() const = 0;
 
-  // TODO(danilchap): Make pure virtual once implemented in derived classed
-  // replacing CurrentNtp function.
-  virtual NtpTime CurrentNtpTime() const;
-
   // Converts an NTP timestamp to a millisecond timestamp.
   static int64_t NtpToMs(uint32_t seconds, uint32_t fractions) {
     return NtpTime(seconds, fractions).ToMs();
@@ -71,8 +67,8 @@ class SimulatedClock : public Clock {
   // source is fixed for this clock.
   int64_t TimeInMicroseconds() const override;
 
-  // Retrieve an NTP absolute timestamp in milliseconds.
-  void CurrentNtp(uint32_t& seconds, uint32_t& fractions) const override;
+  // Retrieve an NTP absolute timestamp.
+  NtpTime CurrentNtpTime() const override;
 
   // Converts an NTP timestamp to a millisecond timestamp.
   int64_t CurrentNtpInMilliseconds() const override;