Delete all use of tick_util.h.

webrtc/system_wrappers/source/clock.cc

 /*
  *  Copyright (c) 2013 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.
  */
 
 #include "webrtc/system_wrappers/include/clock.h"
 
 #if defined(_WIN32)
 // Windows needs to be included before mmsystem.h
 #include "webrtc/base/win32.h"
 #include <MMSystem.h>
 #elif ((defined WEBRTC_LINUX) || (defined WEBRTC_MAC))
 #include <sys/time.h>
 #include <time.h>
 #endif
 
 #include "webrtc/base/criticalsection.h"
+#include "webrtc/base/timeutils.h"
 #include "webrtc/system_wrappers/include/rw_lock_wrapper.h"
-#include "webrtc/system_wrappers/include/tick_util.h"
 
 namespace webrtc {
 
 const double kNtpFracPerMs = 4.294967296E6;
 
 int64_t Clock::NtpToMs(uint32_t ntp_secs, uint32_t ntp_frac) {
   const double ntp_frac_ms = static_cast<double>(ntp_frac) / kNtpFracPerMs;
   return 1000 * static_cast<int64_t>(ntp_secs) +
       static_cast<int64_t>(ntp_frac_ms + 0.5);
 }
 
 class RealTimeClock : public Clock {
   // Return a timestamp in milliseconds relative to some arbitrary source; the
   // source is fixed for this clock.
   int64_t TimeInMilliseconds() const override {
-    return TickTime::MillisecondTimestamp();
+    return rtc::Time64();

[The Sun (google.com), 2016/04/19 17:46:41]

drive-by: Is the plan to change Time64()/Time32() into more meaningful names?
Sorry if this has been discussed already.

   }
 
   // Return a timestamp in microseconds relative to some arbitrary source; the
   // source is fixed for this clock.
   int64_t TimeInMicroseconds() const override {
-    return TickTime::MicrosecondTimestamp();
+    return rtc::TimeMicros();
   }
 
   // Retrieve an NTP absolute timestamp in seconds and fractions of a second.
   void CurrentNtp(uint32_t& seconds, uint32_t& fractions) const override {
     timeval tv = CurrentTimeVal();
     double microseconds_in_seconds;
     Adjust(tv, &seconds, &microseconds_in_seconds);
     fractions = static_cast<uint32_t>(
         microseconds_in_seconds * kMagicNtpFractionalUnit + 0.5);
   }
@@ skipping 205 matching lines @@
 void SimulatedClock::AdvanceTimeMilliseconds(int64_t milliseconds) {
   AdvanceTimeMicroseconds(1000 * milliseconds);
 }
 
 void SimulatedClock::AdvanceTimeMicroseconds(int64_t microseconds) {
   WriteLockScoped synchronize(*lock_);
   time_us_ += microseconds;
 }
 
 };  // namespace webrtc