Delete all use of tick_util.h.

webrtc/system_wrappers/source/condition_variable_unittest.cc

 /*
  *  Copyright (c) 2012 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.
  */
 
 // TODO(tommi): Remove completely.  As is there is still some code for Windows
 // that relies on ConditionVariableEventWin, but code has been removed on other
 // platforms.
 #if defined(WEBRTC_WIN)
 
 #include "webrtc/system_wrappers/source/condition_variable_event_win.h"
 
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webrtc/base/platform_thread.h"
+#include "webrtc/base/timeutils.h"
 #include "webrtc/system_wrappers/include/critical_section_wrapper.h"
-#include "webrtc/system_wrappers/include/tick_util.h"
 #include "webrtc/system_wrappers/include/trace.h"
 
 namespace webrtc {
 
 namespace {
 
 const int kLongWaitMs = 100 * 1000; // A long time in testing terms
 const int kShortWaitMs = 2 * 1000; // Long enough for process switches to happen
 const int kVeryShortWaitMs = 20; // Used when we want a timeout
 
@@ skipping 152 matching lines @@
     ASSERT_TRUE(baton_.Grab(kShortWaitMs));
   }
   EXPECT_EQ(2 * kNumberOfRounds, baton_.PassCount());
 }
 
 TEST(CondVarWaitTest, WaitingWaits) {
   CRITICAL_SECTION crit_sect;
   InitializeCriticalSection(&crit_sect);
   ConditionVariableEventWin cond_var;
   EnterCriticalSection(&crit_sect);
-  int64_t start_ms = TickTime::MillisecondTimestamp();
+  int64_t start_ms = rtc::TimeMillis();
   EXPECT_FALSE(cond_var.SleepCS(&crit_sect, kVeryShortWaitMs));
-  int64_t end_ms = TickTime::MillisecondTimestamp();
+  int64_t end_ms = rtc::TimeMillis();
   EXPECT_LE(start_ms + kVeryShortWaitMs, end_ms)
       << "actual elapsed:" << end_ms - start_ms;
   LeaveCriticalSection(&crit_sect);
   DeleteCriticalSection(&crit_sect);
 }
 
 }  // anonymous namespace
 
 }  // namespace webrtc
 
 #endif  // defined(WEBRTC_WIN)