Assert event timestamp to be monotonic and not from future

third_party/WebKit/Source/platform/HistogramTest.cpp

Index: third_party/WebKit/Source/platform/HistogramTest.cpp
diff --git a/third_party/WebKit/Source/platform/HistogramTest.cpp b/third_party/WebKit/Source/platform/HistogramTest.cpp
index 8b575b6c8ea741ea81b13d0dc28bd2bbdf2a218f..b0b3f78dfc3e4401e77b9590ae2d7d9741aa36e9 100644
--- a/third_party/WebKit/Source/platform/HistogramTest.cpp
+++ b/third_party/WebKit/Source/platform/HistogramTest.cpp
@@ -25,17 +25,20 @@ protected:
     virtual void SetUp()
     {
         s_timeElapsed = 0.0;
-        m_originalTimeFunction = setTimeFunctionsForTesting(returnMockTime);
+        m_originalMonotonicTimeFunction = setMonotonicallyIncreasingTimeFunctionForTesting(returnMockTime);
+        m_originalCurrentTimeFunction = setCurrentTimeFunctionForTesting(returnMockTime);
     }
 
     virtual void TearDown()
     {
-        setTimeFunctionsForTesting(m_originalTimeFunction);
+        setMonotonicallyIncreasingTimeFunctionForTesting(m_originalMonotonicTimeFunction);
+        setCurrentTimeFunctionForTesting(m_originalCurrentTimeFunction);
     }
 
 private:
     static double s_timeElapsed;
-    TimeFunction m_originalTimeFunction;
+    TimeFunction m_originalMonotonicTimeFunction;
+    TimeFunction m_originalCurrentTimeFunction;
 };
 
 double ScopedUsHistogramTimerTest::s_timeElapsed;